diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 9347b6f8e2280abdfe38fc8ac1a19ed6ab5bbb5b..d80636f6da6db2fb2c5fb0e4f4dfad96512cc97e 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -146,7 +146,7 @@ static int aes_helper(struct ast_channel *chan, const char *cmd, char *data,
 	}
 
 	if (encrypt) {                            /* if encrypting encode result to base64 */
-		ast_base64encode(buf, (unsigned char *) tmp, strlen(tmp), len);
+		ast_base64encode(buf, (unsigned char *) tmp, tmpP - tmp, len);
 	} else {
 		memcpy(buf, tmp, len);
 	}