diff --git a/library/Osmocom_CTRL_Types.ttcn b/library/Osmocom_CTRL_Types.ttcn
index 9c993af..5d6ddae 100644
--- a/library/Osmocom_CTRL_Types.ttcn
+++ b/library/Osmocom_CTRL_Types.ttcn
@@ -3,7 +3,7 @@
 type charstring CtrlVerb ("GET", "SET") with {
 	/* see https://www.eclipse.org/forums/index.php/t/1088893/ on why this
 	 * match expression is needed here */
-	variant "TEXT_CODING(,convert=upper_case,'((GET)|(SET)|(TRAP))',case_insensitive)"
+	variant "TEXT_CODING(,convert=upper_case,'((GET)|(SET))',case_insensitive)"
 };
 
 type charstring CtrlReplyVerb ("GET_REPLY", "SET_REPLY") with {
@@ -46,7 +46,7 @@
 	CtrlVariable	variable,
 	CtrlValue	val
 } with {
-	variant "BEGIN('TRAP ',,case_insensitive)"
+	variant "BEGIN('TRAP 0 ',,case_insensitive)"
 	variant "SEPARATOR(' ',)"
 };