diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index ac6675208930486bfc97bce826c510e7fe875e09..f506954dc26d073f9db166f1c0490429f5d9c759 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3766,7 +3766,7 @@ module OneM2M_Functions {
 		
 		group CseSimuFunctions {
 
-			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
+			function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := vc_cSEBaseIndex) runs on CseSimu return integer {
 				var MsgIn v_request;
 				var PrimitiveContent v_modifiedResource;
 				var integer v_resourceIndex, v_parentIndex;
@@ -3777,6 +3777,8 @@ module OneM2M_Functions {
 					p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
 				}
 
+				p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(p_parentIndex);
+
 				f_ae_sendUtPrimitive(p_utRequest, v_action);
 	
 				tc_ac.start;
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index c68acd9bb35795a19cb07963e36bc57ff2119c83..59a815e86bc28b183569b043d37ff5672bbbd201 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -2114,7 +2114,7 @@ module OneM2M_Testcases_AE_Release_1 {
    			  f_checkCseSimuStatus();
 			 
 			  //Create a function to receive the Create PollingChannel and to send the response
-			  v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2);
+			  v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2, v_aeIndex);
 			    				
 			  f_checkCseSimuStatus();