diff --git a/sfc-py/sfc/common/services.py b/sfc-py/sfc/common/services.py
index 3ed9035..1b6a8f5 100644
--- a/sfc-py/sfc/common/services.py
+++ b/sfc-py/sfc/common/services.py
@@ -282,11 +282,11 @@ class BasicService(object):
             offset = 8
         if nsh_decode.is_data_message(data, offset):
             # Must send it to UDP port of VxLAN-gpe
-            # if nsh_decode.is_vxlan_nsh_legacy_message(data, 0):
+            if nsh_decode.is_vxlan_nsh_legacy_message(data, 0):
                 # Disregard source port of received packet and send packet back to 6633
-            addr_l = list(addr)
-            addr_l[1] = 6633
-            addr = tuple(addr_l)
+                addr_l = list(addr)
+                addr_l[1] = 6633
+                addr = tuple(addr_l)
             self.transport.sendto(rw_data, addr)
             logger.info('%s: sending packets to %s', self.service_type, addr)
         elif nsh_decode.is_trace_message(data, offset):