diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 41faf2f46966ca98443cce1c60a77016b59809e3..cfd4bb661f08fb490e46c8463a90e1fe9b98260a 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3339,6 +3339,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var template RequestPrimitive v_req2;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;
+					var RequestID v_expectedRequestIdentifier;
 					
 					// Test control
 		
@@ -3365,7 +3366,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					
 					v_req2.from_ := PX_TS_CSE1.cseId;
-					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+					v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+					v_req2.requestIdentifier :=  pattern "{v_expectedRequestIdentifier}*";
 					
 					tc_ac.start;
 					alt {
@@ -3450,6 +3452,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var template RequestPrimitive v_req2;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;
+					var RequestID v_expectedRequestIdentifier;
 					
 					// Test control
 		
@@ -3472,7 +3475,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					v_req2.from_ := PX_TS_CSE1.cseId;
-					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+					v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+					v_req2.requestIdentifier := pattern "{v_expectedRequestIdentifier}*";
 					
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					f_send(e_mca_port, m_request(v_req1));
@@ -3558,7 +3562,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var RequestPrimitive v_req3;
 					var MsgIn v_resp1, v_resp3;
 					var ResponsePrimitive v_resp2;//Response to a Notify Request
-		
+					var RequestID v_expectedRequestIdentifier;
+					
 					// Test control
 	
 	
@@ -3584,7 +3589,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
 					v_req2.from_ := PX_TS_CSE1.cseId;
-					v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+					v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+					v_req2.requestIdentifier := pattern "{v_expectedRequestIdentifier}*";
 					
 					tc_ac.start;
 					alt {