diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index d78dbe6f2f47f9690ee0a29066f59904c23850d7..f232d13f1de1d9295790ed478c31533e7b521444 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1797,7 +1797,8 @@ module OneM2M_Functions {
 					var ResponsePrimitive v_responsePrimitive;
 					var integer v_resourceIndex := -1;
 				
-					p_requestPrimitive.from_ := PX_CSE1_ID;
+					//p_requestPrimitive.from_ := PX_CSE1_ID;
+					p_requestPrimitive.from_ := f_getOriginator(vc_remoteCseIndex, e_cse);
 					
 					mccPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index b76fc37ce6ae623d4c55e8d46f93c65dd89084cc..764bdb89d296e54ce2e91eaed18e1b977aa9f7fb 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -12583,6 +12583,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 				
 				vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
 				
+				v_req2.from_ := PX_CSE1_ID;
+				
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_req2))) -> value v_resp1 {