1 files changed, 5 insertions, 6 deletions
diff --git a/random.c b/random.c
index fbfa94e4e9..67c752d0f7 100644
--- a/random.c
+++ b/random.c
@@ -126,13 +126,12 @@ rb_f_rand(obj, vmax)
     long val, max;
 
     switch (TYPE(vmax)) {
-      case T_BIGNUM:
-	return rb_big_rand(vmax);
-	
       case T_FLOAT:
-	if (RFLOAT(vmax)->value > LONG_MAX || RFLOAT(vmax)->value < LONG_MIN)
-	    return rb_big_rand(rb_dbl2big(RFLOAT(vmax)->value));
-	break;
+	if (RFLOAT(vmax)->value <= LONG_MAX && RFLOAT(vmax)->value >= LONG_MIN)
+	    break;
+	/* fall through */
+      case T_BIGNUM:
+	return rb_big_rand(vmax, RANDOM_NUMBER);
     }
 
     max = NUM2LONG(vmax);