diff --git a/library/gcm.c b/library/gcm.c
index 910646b28..b575c8f31 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -254,6 +254,7 @@ int mbedtls_gcm_starts( mbedtls_gcm_context *ctx,
     size_t i;
     const unsigned char *p;
     size_t use_len, olen = 0;
+    size_t iv_bits;
 
     GCM_VALIDATE_RET( ctx != NULL );
     GCM_VALIDATE_RET( iv != NULL );
@@ -278,7 +279,9 @@ int mbedtls_gcm_starts( mbedtls_gcm_context *ctx,
     else
     {
         memset( work_buf, 0x00, 16 );
-        MBEDTLS_PUT_UINT32_BE( iv_len * 8, work_buf, 12 );
+        iv_bits = iv_len << 3;
+        MBEDTLS_PUT_UINT32_BE( (iv_bits >> 32), work_buf, 8  );
+        MBEDTLS_PUT_UINT32_BE( iv_bits, work_buf, 12 );
 
         p = iv;
         while( iv_len > 0 )