diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/networks.bash b/targets/PROJECTS/GENERIC-LTE-EPC/networks.bash
index 7cbd1cc89d..4b4173e6cb 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/networks.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/networks.bash
@@ -271,6 +271,16 @@ clean_network() {
 }
 
 
+delete_sgi_vlans() {
+    
+    for i in 5 6 7 8 9 10 11 12 13 14 15
+    do
+        delete_vlan_interface  $PGW_INTERFACE_NAME_FOR_SGI.$i 
+    done
+}
+
+
+
 create_sgi_vlans() {
 
     get_mac_router
@@ -292,8 +302,6 @@ create_sgi_vlans() {
         set_interface_up $PGW_INTERFACE_NAME_FOR_SGI.$i "10.0."$NET".2" 24
         
     done
-
-
 }
 
 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
index a606c417db..fa8cdaa99c 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
@@ -229,6 +229,8 @@ VARIABLES="
            MME_IPV4_ADDRESS_FOR_S1_MME\|\
            MME_INTERFACE_NAME_FOR_S11_MME\|\
            MME_IPV4_ADDRESS_FOR_S11_MME\|\
+           HSS_INTERFACE_NAME_FOR_S6A\|\
+           HSS_IPV4_ADDRESS_FOR_S6A\|\
            SGW_INTERFACE_NAME_FOR_S11\|\
            SGW_IPV4_ADDRESS_FOR_S11\|\
            SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP\|\
@@ -250,6 +252,7 @@ declare ENB_IPV4_NETMASK_FOR_S1_MME=$(       echo $ENB_IPV4_ADDRESS_FOR_S1_MME
 declare ENB_IPV4_NETMASK_FOR_S1U=$(          echo $ENB_IPV4_ADDRESS_FOR_S1U           | cut -f2 -d '/')
 declare MME_IPV4_NETMASK_FOR_S1_MME=$(       echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f2 -d '/')
 declare MME_IPV4_NETMASK_FOR_S11_MME=$(      echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f2 -d '/')
+declare MME_IPV4_NETMASK_FOR_S6A=$(          echo $MME_IPV4_ADDRESS_FOR_S6A           | cut -f2 -d '/')
 declare SGW_IPV4_NETMASK_FOR_S11=$(          echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f2 -d '/')
 declare SGW_IPV4_NETMASK_FOR_S1U_S12_S4_UP=$(echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f2 -d '/')
 declare SGW_IPV4_NETMASK_FOR_S5_S8_UP=$(     echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f2 -d '/')
@@ -261,6 +264,7 @@ ENB_IPV4_ADDRESS_FOR_S1U=$(                  echo $ENB_IPV4_ADDRESS_FOR_S1U
 MME_IPV4_ADDRESS_FOR_S1_MME=$(               echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
 MME_IPV4_ADDRESS_FOR_S11_MME=$(              echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f1 -d '/')
 SGW_IPV4_ADDRESS_FOR_S11=$(                  echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f1 -d '/')
+SGW_IPV4_ADDRESS_FOR_S6A=$(                  echo $SGW_IPV4_ADDRESS_FOR_S6A           | cut -f1 -d '/')
 SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP=$(        echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f1 -d '/')
 SGW_IPV4_ADDRESS_FOR_S5_S8_UP=$(             echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f1 -d '/')
 PGW_IPV4_ADDRESS_FOR_S5_S8=$(                echo $PGW_IPV4_ADDRESS_FOR_S5_S8         | cut -f1 -d '/')
@@ -276,7 +280,8 @@ PGW_IPV4_ADDR_FOR_SGI=$(                     echo $PGW_IPV4_ADDR_FOR_SGI
 #        build_mme_spgw_vlan_network
 #else
 #   clean_epc_vlan_network
-#   create_sgi_vlans
+#create_sgi_vlans
+delete_sgi_vlans
 #fi
 
 get_mac_router
@@ -319,7 +324,14 @@ trap control_c SIGINT
 echo_success "Resolving hss.eur"
 HSS_IP=$(get_ip hss.eur)
 echo_success "HSS_IP: $HSS_IP"
-MME_INTERFACE_NAME_FOR_S6A=`ip route get $HSS_IP | grep $HSS_IP | cut -d ' ' -f 3`
+
+HSS_ROUTE=$(ip route get $HSS_IP | grep $HSS_IP )
+HSS_ROUTE_IS_LOCAL=`echo $HSS_ROUTE | cut -d ' ' -f 1`
+if [ "x$HSS_ROUTE_IS_LOCAL" == "xlocal" ]; then 
+    MME_INTERFACE_NAME_FOR_S6A=`ip route get $HSS_IP | grep $HSS_IP | cut -d ' ' -f 4`
+else
+    MME_INTERFACE_NAME_FOR_S6A=`ip route get $HSS_IP | grep $HSS_IP | cut -d ' ' -f 3`
+fi
 
 echo_success "MME_INTERFACE_NAME_FOR_S1_MME : $MME_INTERFACE_NAME_FOR_S1_MME"
 echo_success "MME_INTERFACE_NAME_FOR_S6A    : $MME_INTERFACE_NAME_FOR_S6A"