diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 824050f..bfe607d 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -69,7 +69,6 @@
     <ID>MagicNumber:UUID.kt$UUID$0x0fffL</ID>
     <ID>MagicNumber:UUID.kt$UUID$0x1fff</ID>
     <ID>MagicNumber:UUID.kt$UUID$0xf000L</ID>
-    <ID>MagicNumber:UUID.kt$UUID$0xffff00000000L</ID>
     <ID>MagicNumber:UUID.kt$UUID$0xffff0000L</ID>
     <ID>MagicNumber:UUID.kt$UUID$0xffffffffffffL</ID>
     <ID>MagicNumber:UUID.kt$UUID$12</ID>
@@ -90,9 +89,9 @@
     <ID>MagicNumber:UUID7.kt$0x3fffffffffffffffL</ID>
     <ID>MagicNumber:UUID7.kt$0x7000L</ID>
     <ID>MagicNumber:UUID7.kt$0x80L</ID>
+    <ID>MagicNumber:UUID7.kt$12</ID>
     <ID>MagicNumber:UUID7.kt$16</ID>
-    <ID>MagicNumber:UUID7.kt$20</ID>
     <ID>TooManyFunctions:SHA1.kt$SHA1</ID>
-    <ID>VariableNaming:UUID7.kt$val rand_a = (random.nextInt() shr 20).toLong()</ID>
+    <ID>VariableNaming:UUID7.kt$val rand_a = random.nextBits(12).toLong()</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/UUID7.kt b/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/UUID7.kt
index eecde96..be36623 100644
--- a/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/UUID7.kt
+++ b/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/UUID7.kt
@@ -14,10 +14,10 @@ private const val UNIX_48_TIMESTAMP = 0x1FFF_FFFF_FFFF_FL
 @UUIDExperimentalAPI
 public fun UUIDv7(timeStamp: Long, random: Random = SecureRandom): UUID {
     require(timeStamp <= UNIX_48_TIMESTAMP) {
-        "timeStamp $timeStamp must be 48 bits, was $timeStamp."
+        "timeStamp $timeStamp must be <= 48 bits, was $timeStamp."
     }
     val leftTimeStamp = timeStamp shl 16
-    val rand_a = (random.nextInt() shr 20).toLong()
+    val rand_a = random.nextBits(12).toLong()
     val timeStampAndVersionRaw = (leftTimeStamp or rand_a) and -0xf001L or 0x7000L
 
     // set variant to 4 or 5