diff --git a/include/capstone/capstone.h b/include/capstone/capstone.h
index 93c378f..0f0596d 100644
--- a/include/capstone/capstone.h
+++ b/include/capstone/capstone.h
@@ -90,6 +90,12 @@
 #endif
 
 #if CS_NEXT_VERSION < 6
+#define CS_aarch64_ arm64
+#else
+#define CS_aarch64_ aarch64
+#endif
+
+#if CS_NEXT_VERSION < 6
 #define CS_aarch64(x) arm64##x
 #else
 #define CS_aarch64(x) aarch64##x
diff --git a/tests/test_arm64.c b/tests/test_arm64.c
index a331d7f..1237ea7 100644
--- a/tests/test_arm64.c
+++ b/tests/test_arm64.c
@@ -232,7 +232,7 @@
 	CS_cs_aarch64() arm64_detail = { 0 };
 	detail.arm64 = arm64_detail;
 	CS_aarch64_op() op = { 0 };
-	detail.CS_aarch64().operands[0] = op;
+	detail.CS_aarch64_.operands[0] = op;
 	CS_aarch64_reg() reg = 1;
 	CS_aarch64_cc() cc = ARM64_CC_AL;
 	CS_aarch64_extender() arm64_extender = ARM64_EXT_SXTB;