diff --git a/include/functions.inc b/include/functions.inc
index f99669831a35ce9e7469bd9af721442eaf4f3bcd..ee822ff04345460f1bbeda6842a67501f97fa679 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2471,22 +2471,25 @@ if (!function_exists('random_int')) {
       throw new Exception('Invalid range passed to random_int');
     }
 
-    $log    = log($range, 2);
+    $log      = log($range, 2);
     // length in bytes
     $nbBytes  = (int) ($log / 8) + 1;
     // length in bits
     $nbBits   = (int) $log + 1;
     // set all lower bits to 1
-    $filter = (int) (1 << $nbBits) - 1;
+    $filter   = pow(2, $nbBits) - 1;
+    if ($filter >= PHP_INT_MAX) {
+      $filter = PHP_INT_MAX;
+    }
     do {
       $randomBytes = openssl_random_pseudo_bytes($nbBytes, $strong);
       if (!$strong || ($randomBytes === FALSE)) {
         throw new Exception('Failed to get random bytes');
       }
-      $rnd = unpack('L', $randomBytes)[1];
+      $rnd = hexdec(bin2hex($randomBytes));
       // discard irrelevant bits
       $rnd = $rnd & $filter;
-    } while ($rnd >= $range);
+    } while ($rnd > $range);
     return $min + $rnd;
   }
 }