diff --git a/src/Core/Models/Domain/SymmetricCryptoKey.cs b/src/Core/Models/Domain/SymmetricCryptoKey.cs
index 4cd299090..9f2439b79 100644
--- a/src/Core/Models/Domain/SymmetricCryptoKey.cs
+++ b/src/Core/Models/Domain/SymmetricCryptoKey.cs
@@ -42,7 +42,7 @@ namespace Bit.Core.Models.Domain
                 EncKey = new ArraySegment<byte>(Key, 0, 16).ToArray();
                 MacKey = new ArraySegment<byte>(Key, 16, 16).ToArray();
             }
-            else if(EncType == EncryptionType.AesCbc256_HmacSha256_B64 && Key.Length == 34)
+            else if(EncType == EncryptionType.AesCbc256_HmacSha256_B64 && Key.Length == 64)
             {
                 EncKey = new ArraySegment<byte>(Key, 0, 32).ToArray();
                 MacKey = new ArraySegment<byte>(Key, 32, 32).ToArray();
diff --git a/src/Core/Services/CryptoService.cs b/src/Core/Services/CryptoService.cs
index 1ed9570ef..764b72500 100644
--- a/src/Core/Services/CryptoService.cs
+++ b/src/Core/Services/CryptoService.cs
@@ -613,9 +613,9 @@ namespace Bit.Core.Services
             Buffer.BlockCopy(dataBytes, 0, macDataBytes, ivBytes.Length, dataBytes.Length);
 
             byte[] macKey = null;
-            if(key.MacKey != null)
+            if(theKey.MacKey != null)
             {
-                macKey = key.MacKey;
+                macKey = theKey.MacKey;
             }
             byte[] macBytes = null;
             if(mac != null)