diff --git a/library/dhm.c b/library/dhm.c
index 85840c3..c010d9f 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -360,7 +360,7 @@
         if( count++ > 10 )
             return( MBEDTLS_ERR_MPI_NOT_ACCEPTABLE );
     }
-    while( mbedtls_mpi_cmp_int( R, 1 ) <= 0 );
+    while( dhm_check_range( R, M ) != 0 );
 
 cleanup:
     return( ret );
@@ -413,7 +413,7 @@
      * We need to generate blinding values from scratch
      */
 
-    /* Vi = random( 2, P-1 ) */
+    /* Vi = random( 2, P-2 ) */
     MBEDTLS_MPI_CHK( dhm_random_below( &ctx->Vi, &ctx->P, f_rng, p_rng ) );
 
     /* Vf = Vi^-X mod P