diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index f4fb772e15b..218e2613e0f 100644
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -996,15 +996,15 @@ static int do_event (int *id, int timeout)
 		}
 		else if (p->state == PHP_YAZ_STATE_CONNECTING)
 		{
-			if (FD_ISSET (fd, &input))
+			if (FD_ISSET (fd, &output))
+			{
+				send_init(p);
+			}
+			else if (FD_ISSET (fd, &input))
 			{
 				do_close(p);
 				p->error = PHP_YAZ_ERROR_CONNECT;
 			}
-			else if (FD_ISSET (fd, &output))
-			{
-				send_init(p);
-			}
 		}
 		else if (p->state == PHP_YAZ_STATE_ESTABLISHED)
 		{