diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
index 9e9e63c..b8bf6dd0 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
@@ -260,12 +260,12 @@
             }
 
             driverHandlers.put(deviceId, handler);
-            hTime = now();
         }
 
         // Always (re)initialize the pipeline behaviour
         log.info("Driver {} bound to device {} ... initializing driver",
                  handler.driver().name(), deviceId);
+        hTime = now();
         Pipeliner pipeliner = handler.behaviour(Pipeliner.class);
         hbTime = now();
         pipeliner.init(deviceId, context);
diff --git a/tools/test/scenarios/net-pingall.xml b/tools/test/scenarios/net-pingall.xml
index 3a4f684..49ed6e6 100644
--- a/tools/test/scenarios/net-pingall.xml
+++ b/tools/test/scenarios/net-pingall.xml
@@ -17,7 +17,7 @@
     <!-- TODO: parametrize this via recipes -->
     <group name="Net-Pingall">
         <step name="Ping-All-And-Verify"
-              exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: .* dropped"/>
+              exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: [0-5]% dropped"/>
 
         <step name="Check-Summary-For-Hosts" requires="~Ping-All-And-Verify"
               exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>