diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index c15f5c9a39..6ccc45d3f1 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -934,6 +934,10 @@ switch_status_t channel_answer_channel(switch_core_session_t *session)
 		atoi(switch_channel_get_variable(channel, "skinny_device_instance")), &listener);
 	if (listener) {
 		skinny_session_start_media(session, listener, atoi(switch_channel_get_variable(channel, "skinny_line_instance")));
+		/* Wait for media */
+		while(!switch_test_flag(tech_pvt, TFLAG_IO)) {
+			switch_cond_next();
+		}
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unable to find listener to answer %s:%s\n",
 			switch_channel_get_variable(channel, "skinny_device_name"), switch_channel_get_variable(channel, "skinny_device_instance"));
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 62ceffa446..e48ab244c2 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -374,8 +374,6 @@ switch_status_t skinny_session_send_call_info(switch_core_session_t *session, li
 struct skinny_ring_lines_helper {
 	private_t *tech_pvt;
 	uint32_t lines_count;
-	char *effective_callee_id_number;
-	char *effective_callee_id_name;
 };
 
 int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnNames)
@@ -407,12 +405,8 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
 	    device_name, device_instance, &listener);
 	if(listener) {
 		helper->lines_count++;
-		if (!helper->effective_callee_id_number) {
-			helper->effective_callee_id_number = switch_core_session_strdup(helper->tech_pvt->session, value);
-		}
-		if (!helper->effective_callee_id_name) {
-			helper->effective_callee_id_name = switch_core_session_strdup(helper->tech_pvt->session, caller_name);
-		}
+		switch_channel_set_variable(switch_core_session_get_channel(helper->tech_pvt->session), "effective_callee_id_number", value);
+		switch_channel_set_variable(switch_core_session_get_channel(helper->tech_pvt->session), "effective_callee_id_name", caller_name);
 		skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_RING_IN);
 		send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_RING_IN, 0xffff);
 	    if ((tmp = switch_mprintf("%s%s", SKINNY_DISP_FROM, helper->tech_pvt->caller_profile->destination_number))) {
@@ -441,17 +435,9 @@ switch_call_cause_t skinny_ring_lines(private_t *tech_pvt)
 
 	helper.tech_pvt = tech_pvt;
 	helper.lines_count = 0;
-	helper.effective_callee_id_number = NULL;
-	helper.effective_callee_id_name = NULL;
 
 	status = skinny_session_walk_lines(tech_pvt->profile,
 	    switch_core_session_get_uuid(tech_pvt->session), skinny_ring_lines_callback, &helper);
-	if (helper.effective_callee_id_number) {
-		switch_channel_set_variable(switch_core_session_get_channel(tech_pvt->session), "effective_callee_id_number", helper.effective_callee_id_number);
-	}
-	if (helper.effective_callee_id_name) {
-		switch_channel_set_variable(switch_core_session_get_channel(tech_pvt->session), "effective_callee_id_name", helper.effective_callee_id_name);
-	}
 	if (status != SWITCH_STATUS_SUCCESS) {
 		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
 	} else if (helper.lines_count == 0) {