diff --git a/gfpcrypt.h b/gfpcrypt.h
index f15c397e..bcc064e6 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -716,7 +716,8 @@ public:
         if (DHAES_MODE)
         {
             macKey = key;
-            cipherKey = key + MAC::DIGESTSIZE;
+            //cipherKey = key + MAC::DIGESTSIZE;
+            cipherKey = key + MAC::DEDAULT_KEYLENGTH;
         }
         else
         {
@@ -748,7 +749,8 @@ public:
         if (DHAES_MODE)
         {
             macKey = key;
-            cipherKey = key + MAC::DIGESTSIZE;
+            //cipherKey = key + MAC::DIGESTSIZE;
+            cipherKey = key + MAC::DEDAULT_KEYLENGTH;
         }
         else
         {