diff --git a/emulator/harptool b/emulator/harptool
index 33f56088..0cf9a2cd 100755
Binary files a/emulator/harptool and b/emulator/harptool differ
diff --git a/emulator/libharplib.a b/emulator/libharplib.a
index 43d13af8..045f5b74 100644
Binary files a/emulator/libharplib.a and b/emulator/libharplib.a differ
diff --git a/emulator/libharplib.so b/emulator/libharplib.so
index 8bd6116d..6afd15b4 100755
Binary files a/emulator/libharplib.so and b/emulator/libharplib.so differ
diff --git a/kernel/vx_os/vx_back/vx_back.c b/kernel/vx_os/vx_back/vx_back.c
index 82622a83..e7cef681 100644
--- a/kernel/vx_os/vx_back/vx_back.c
+++ b/kernel/vx_os/vx_back/vx_back.c
@@ -123,10 +123,11 @@ void vx_wait_for_warps(unsigned num_wait)
 	vx_printf("wait for: ", num_wait);
 	unsigned num_available_warps = vx_available_warps();
 	unsigned num = 0;
-	while (num != num_wait)
+	while (num < num_wait)
 	{
 		// change num=1 if running on RTL
-		num = 0;
+		// Change num=0 if running on emulator
+		num = 1;
 		for (int i = 0; i < 32; i++)
 		{
 			if (done[i] == 1)