diff --git a/src/MICore/CommandFactories/gdb.cs b/src/MICore/CommandFactories/gdb.cs
index 5df01be1c..9131d2373 100644
--- a/src/MICore/CommandFactories/gdb.cs
+++ b/src/MICore/CommandFactories/gdb.cs
@@ -201,6 +201,8 @@ public override Task ExecJump(string filename, int line)
 
         public override Task ExecJump(ulong address)
         {
+            return _debugger.ConsoleCmdAsync("set $pc = " + string.Format(CultureInfo.InvariantCulture, "0x{0:X}", address), false);
+
             string target = "*" + string.Format(CultureInfo.InvariantCulture, "0x{0:X}", address);
             return JumpInternal(target);
         }
diff --git a/src/MIDebugEngine/AD7.Impl/AD7Engine.cs b/src/MIDebugEngine/AD7.Impl/AD7Engine.cs
index 49e179530..cf23fa3d9 100755
--- a/src/MIDebugEngine/AD7.Impl/AD7Engine.cs
+++ b/src/MIDebugEngine/AD7.Impl/AD7Engine.cs
@@ -216,6 +216,7 @@ public int Jump(ulong address)
                 _engineCallback.OnError(EngineUtils.GetExceptionDescription(e));
                 return Constants.E_ABORT;
             }
+            DebuggedProcess.ThreadCache.MarkDirty();
 
             return Constants.S_OK;
         }
diff --git a/src/OpenDebugAD7/AD7DebugSession.cs b/src/OpenDebugAD7/AD7DebugSession.cs
index d4c5cfbd0..2f5b5bed1 100644
--- a/src/OpenDebugAD7/AD7DebugSession.cs
+++ b/src/OpenDebugAD7/AD7DebugSession.cs
@@ -1344,7 +1344,7 @@ protected override void HandleGotoRequestAsync(IRequestResponder<GotoArguments>
                         if (!m_threads.TryGetValue(responder.Arguments.ThreadId, out thread))
                             throw new AD7Exception("Unknown thread id: " + responder.Arguments.ThreadId.ToString(CultureInfo.InvariantCulture));
                     }
-                    BeforeContinue();
+                    //BeforeContinue();
                     builder.CheckHR(thread.SetNextStatement(null, gotoTarget));
                 }
             }