diff --git a/app/dialplan/resources/switch/conf/dialplan/020_call_direction.xml b/app/dialplan/resources/switch/conf/dialplan/020_call_direction.xml
index 8b7e7ffe2f..f7fea2abb7 100644
--- a/app/dialplan/resources/switch/conf/dialplan/020_call_direction.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/020_call_direction.xml
@@ -1,7 +1,7 @@
 <context name="{v_context}">
 	<extension name="call-direction" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="true">
 		<condition field="${call_direction}" expression="^(inbound|outbound|local)$" break="never">
-			<anti-action application="set" data="call_direction=local"/>
+			<anti-action application="set" data="call_direction=local" inline="true"/>
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/switch/conf/dialplan/890_local_extension.xml b/app/dialplan/resources/switch/conf/dialplan/890_local_extension.xml
index 120f1914e3..c30c7383ba 100644
--- a/app/dialplan/resources/switch/conf/dialplan/890_local_extension.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/890_local_extension.xml
@@ -6,11 +6,16 @@
 			<action application="limit" data="hash ${domain_name} ${destination_number} ${limit_max} ${limit_destination}" inline="false" />
 		</condition>
 
+		<condition field="${call_direction}" expression="local" break="never">
+			<action application="set" data="bind_target=both" inline="true"/>
+			<anti-action application="set" data="bind_target=peer" inline="true"/>
+		</condition>
+
 		<condition>
-			<action application="bind_digit_action" data="local,*1,exec:execute_extension,dx XML ${context},peer"/>
-			<action application="bind_digit_action" data="local,*2,exec:record_session,$${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},peer"/>
-			<action application="bind_digit_action" data="local,*3,exec:execute_extension,cf XML ${context},peer"/>
-			<action application="bind_digit_action" data="local,*4,exec:execute_extension,att_xfer XML ${context},peer"/>
+			<action application="bind_digit_action" data="local,*1,exec:execute_extension,dx XML ${context},${bind_target}"/>
+			<action application="bind_digit_action" data="local,*2,exec:record_session,$${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
+			<action application="bind_digit_action" data="local,*3,exec:execute_extension,cf XML ${context},${bind_target}"/>
+			<action application="bind_digit_action" data="local,*4,exec:execute_extension,att_xfer XML ${context},${bind_target}"/>
 			<action application="digit_action_set_realm" data="local"/>
 		</condition>
 
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
index 9f82aa59e7..2aacabf627 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
@@ -262,7 +262,7 @@
 					if (call_context == "public" or string.sub(call_context, 0, 7) == "public@" or string.sub(call_context, -7) == ".public") then
 						if (dialplan_detail_tag == "action") then
 							if (first_action) then
-								table.insert(xml, [[					<action application="set" data="call_direction=inbound"/>]]);
+								table.insert(xml, [[					<action application="set" data="call_direction=inbound" inline="true"/>]]);
 								if (domain_uuid ~= nil and domain_uuid ~= '') then
 									domain_name = domains[domain_uuid];
 									table.insert(xml, [[					<action application="set" data="domain_uuid=]] .. domain_uuid .. [["/>]]);