diff --git a/mininet/net.py b/mininet/net.py
index a73ba47..2c7668d 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -190,7 +190,7 @@ class Mininet( object ):
             if not remaining:
                 info( '\n' )
                 return True
-            if time > timeout and timeout is not None:
+            if timeout is not None and time > timeout:
                 break
             sleep( delay )
             time += delay