diff --git a/include/arm.h b/include/arm.h
index 18d0fa20..003b0baf 100644
--- a/include/arm.h
+++ b/include/arm.h
@@ -91,7 +91,7 @@ typedef struct cs_arm {
 	// or 0 when instruction has no operand.
 	uint8_t op_count;
 
-	cs_arm_op operands[20];	// operands for this instruction.
+	cs_arm_op operands[36];	// operands for this instruction.
 } cs_arm;
 
 //> ARM registers
diff --git a/include/capstone.h b/include/capstone.h
index c19d651b..f210dcf6 100644
--- a/include/capstone.h
+++ b/include/capstone.h
@@ -134,7 +134,7 @@ typedef struct cs_insn {
 
 	// Ascii text of instruction operands
 	// This information is available even when CS_OPT_DETAIL = CS_OPT_OFF
-	char op_str[96];
+	char op_str[136];
 
 	// Pointer to cs_detail.
 	// NOTE: detail pointer is only valid (not NULL) when CS_OP_DETAIL = CS_OPT_ON