diff --git a/library/gcm.c b/library/gcm.c
index 0810fd220..e1c1c7d51 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -278,8 +278,7 @@ int mbedtls_gcm_starts( mbedtls_gcm_context *ctx,
     else
     {
         memset( work_buf, 0x00, 16 );
-        MBEDTLS_PUT_UINT32_BE( iv_len >> 29, work_buf, 8  );
-        MBEDTLS_PUT_UINT32_BE( iv_len << 3,  work_buf, 12 );
+        MBEDTLS_PUT_UINT64_BE( iv_len * 8,  work_buf, 8 );
 
         p = iv;
         while( iv_len > 0 )