diff --git a/src/tpm2/CommandDispatchData.h b/src/tpm2/CommandDispatchData.h
index 9cf43936..efda240b 100644
--- a/src/tpm2/CommandDispatchData.h
+++ b/src/tpm2/CommandDispatchData.h
@@ -174,9 +174,7 @@ const _UNMARSHAL_T_ unmarshalArray[] = {
 					UNMARSHAL_DISPATCH(TPMI_DH_CONTEXT),
 #define TPMI_DH_PERSISTENT_P_UNMARSHAL          (TPMI_DH_CONTEXT_P_UNMARSHAL + 1)
 					UNMARSHAL_DISPATCH(TPMI_DH_PERSISTENT),
-#define TPMI_ECC_CURVE_P_UNMARSHAL              (TPMI_DH_PERSISTENT_P_UNMARSHAL + 1)
-					UNMARSHAL_DISPATCH(TPMI_ECC_CURVE),
-#define TPMI_YES_NO_P_UNMARSHAL                 (TPMI_ECC_CURVE_P_UNMARSHAL + 1)
+#define TPMI_YES_NO_P_UNMARSHAL                 (TPMI_DH_PERSISTENT_P_UNMARSHAL + 1)
 					UNMARSHAL_DISPATCH(TPMI_YES_NO),
 #define TPML_ALG_P_UNMARSHAL                    (TPMI_YES_NO_P_UNMARSHAL + 1)
 					UNMARSHAL_DISPATCH(TPML_ALG),
@@ -234,7 +232,9 @@ const _UNMARSHAL_T_ unmarshalArray[] = {
 #define TPMI_DH_PCR_P_UNMARSHAL						\
 					(TPMI_ALG_MAC_SCHEME_P_UNMARSHAL + 1)
 					UNMARSHAL_DISPATCH(TPMI_DH_PCR),
-#define TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL       (TPMI_DH_PCR_P_UNMARSHAL + 1)
+#define TPMI_ECC_CURVE_P_UNMARSHAL              (TPMI_DH_PCR_P_UNMARSHAL + 1)
+					UNMARSHAL_DISPATCH(TPMI_ECC_CURVE),
+#define TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL       (TPMI_ECC_CURVE_P_UNMARSHAL + 1)
 					UNMARSHAL_DISPATCH(TPMI_ECC_KEY_EXCHANGE),
 #define TPMI_RH_ENABLES_P_UNMARSHAL					\
 					(TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL + 1)
diff --git a/tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 b/tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5
new file mode 100755
index 00000000..91b37606
Binary files /dev/null and b/tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 differ