diff --git a/lib/ipc/server.c b/lib/ipc/server.c
index 4174d2d98..86e1dfa1d 100644
--- a/lib/ipc/server.c
+++ b/lib/ipc/server.c
@@ -735,7 +735,8 @@ process_loop(void)
 		if (n < num_clients - 1)
 		    clients[n] = clients[num_clients - 1];
 		num_clients--;
-	    }
+	    } else
+		n++;
 	}
 
 	free(fds);
@@ -864,7 +865,7 @@ heim_sipc_free_context(heim_sipc ctx)
 void
 heim_ipc_main(void)
 {
-#if __APPLE__
+#ifdef HAVE_GCD
     dispatch_main();
 #else
     process_loop();