diff --git a/library/base64.c b/library/base64.c
index 3432e5f..d4fdf6e 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -192,7 +192,7 @@
         return( 0 );
     }
 
-    n = ( ( n * 6 ) + 7 ) >> 3;
+    n = ( 6 * ( n >> 3 ) ) + ( ( 6 * ( n & 0x7 ) + 7 ) >> 3 );
     n -= j;
 
     if( dst == NULL || dlen < n )