diff --git a/ChangeLog b/ChangeLog
index 93963916..354e2581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-19  Martin Baulig  <martin@ximian.com>
+
+	* backend/ThreadManager.cs: Fixed a hard to find race condition.
+
 2008-08-14  Martin Baulig  <martin@ximian.com>
 
 	* symbolwriter/MdbSymbolReader.cs: Add `-verbose' command line
diff --git a/backend/SingleSteppingEngine.cs b/backend/SingleSteppingEngine.cs
index 6400097e..a27c4f89 100644
--- a/backend/SingleSteppingEngine.cs
+++ b/backend/SingleSteppingEngine.cs
@@ -2654,8 +2654,9 @@ protected override void DoExecute ()
 							       out TargetEventArgs args)
 		{
 			Report.Debug (DebugFlags.SSE,
-				      "{0} executed instruction {1} at {2}: {3}",
-				      sse, Instruction, inferior.CurrentFrame, cevent);
+				      "{0} executed instruction at {1}: {2}\n{3}",
+				      sse, inferior.CurrentFrame, cevent,
+				      TargetBinaryReader.HexDump (Instruction));
 
 			args = null;
 			if (pushed_code_buffer) {
diff --git a/backend/ThreadManager.cs b/backend/ThreadManager.cs
index 3b2308f5..aaf420aa 100644
--- a/backend/ThreadManager.cs
+++ b/backend/ThreadManager.cs
@@ -330,7 +330,8 @@ void engine_thread_main ()
 
 				check_pending_events ();
 
-				engine_event.Set ();
+				if (command == null)
+					engine_event.Set ();
 				RequestWait ();
 			}