diff --git a/ofdpa/bugsKnown.py b/ofdpa/bugsKnown.py
index 1c0950d..c7cb5dd 100755
--- a/ofdpa/bugsKnown.py
+++ b/ofdpa/bugsKnown.py
@@ -406,13 +406,13 @@
     """
 
     def runTest(self):
-        delete_all_flows(self.controller)
-        delete_all_groups(self.controller)
 
         intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
         dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
         dip=0xc0a80001
         ports = sorted(config["port_map"].keys())
+        Groups = Queue.LifoQueue()
+
         for port in ports:
             #add l2 interface group
             vlan_id=port
@@ -425,7 +425,8 @@
             add_termination_flow(self.controller, port, 0x0800, intf_src_mac, vlan_id)
             #add unicast routing flow
             dst_ip = dip + (vlan_id<<8)
-            add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0xfffffff0, l3_msg.group_id, send_ctrl=True)
+            add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0xffffff00, l3_msg.group_id, send_ctrl=True)
+            Groups.put(l3_msg.group_id)
 
         do_barrier(self.controller)
 
@@ -444,6 +445,8 @@
                 self.dataplane.send(in_port, pkt)
                 verify_packet_in(self, pkt, in_port, ofp.OFPR_ACTION)
                 #verify_no_other_packets(self)
+        #delete_all_flows(self.controller)
+        #delete_groups(self.controller, Groups)
 
 @disabled
 class PacketInSrcMacMiss(base_tests.SimpleDataPlane):