diff --git a/uuid/uuid.cpp b/uuid/uuid.cpp
index e28d0f0..76d18da 100644
--- a/uuid/uuid.cpp
+++ b/uuid/uuid.cpp
@@ -284,10 +284,10 @@ void uuid::setRFC4122Fields_()
   }
 
   clock_seq_  = fields.clock_seq_low;
-  clock_seq_ |= (fields.clock_seq_hi_variant & 0b00111111) << 8;
+  clock_seq_ |= (uint16_t)(fields.clock_seq_hi_variant & 0b00111111) << 8;
 
   node_  = fields.node_low;
-  node_ |= (fields.node_high << 16);
+  node_ |= (uint64_t)fields.node_high << 16;
 }