diff --git a/src/python/oftest/controller.py b/src/python/oftest/controller.py
index cc8b97c..29a605e 100644
--- a/src/python/oftest/controller.py
+++ b/src/python/oftest/controller.py
@@ -296,11 +296,9 @@
 
             with self.connect_cv:
                 (self.switch_socket, self.switch_addr) = (sock, addr)
+                if self.initial_hello:
+                    self.message_send(hello())
                 self.connect_cv.notify() # Notify anyone waiting
-
-            if self.initial_hello:
-                self.message_send(hello())
-                ## @fixme Check return code
         elif s and s == self.switch_socket:
             for idx in range(3): # debug: try a couple of times
                 try: