diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Engine.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Engine.cs
index 2a5ee2bfe..e70a62cf8 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Engine.cs
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Engine.cs
@@ -498,6 +498,7 @@ namespace Cosmos.Debug.VSDebugEngine
                 }
 
                 //                m_debuggedProcess.Terminate();
+                mProcess.Terminate();
                 m_engineCallback.OnProcessExit(0);
 
                 return VSConstants.S_OK;
@@ -703,6 +704,7 @@ namespace Cosmos.Debug.VSDebugEngine
         public int Step(IDebugThread2 pThread, uint sk, uint Step)
         {
             Trace.WriteLine(new StackTrace(false).GetFrame(0).GetMethod().GetFullName());
+            mProcess.Step();
 
             return VSConstants.S_OK;
         }
diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
index 31056878a..931b99bac 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
@@ -222,6 +222,7 @@ namespace Cosmos.Debug.VSDebugEngine
 
         public int Terminate()
         {
+            mProcess.Kill();
             return VSConstants.S_OK;
         }
 
@@ -253,5 +254,10 @@ namespace Cosmos.Debug.VSDebugEngine
             mCurrentAddress = null;
             mDebugEngine.DebugConnector.SendCommand((byte)Command.Break);
         }
+
+        internal void Step()
+        {
+            mDebugEngine.DebugConnector.SendCommand((byte)Command.Step);
+        }
     }
 }
\ No newline at end of file