Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 65935)
+++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 65936)
@@ -4423,8 +4423,6 @@
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
+        pSvmTransient->fUpdateTscOffsetting = true;
         hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 2);
-        pSvmTransient->fUpdateTscOffsetting = true;
-
-        /* Single step check. */
         HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
     }
@@ -4448,6 +4446,6 @@
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
+        pSvmTransient->fUpdateTscOffsetting = true;
         hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 3);
-        pSvmTransient->fUpdateTscOffsetting = true;
         HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
     }
@@ -4691,6 +4689,6 @@
                 HMCPU_CF_SET(pVCpu, HM_CHANGED_SVM_GUEST_APIC_STATE);
             }
+            rc = VINF_SUCCESS;
             hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 2);
-            rc = VINF_SUCCESS;
             HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
             return rc;
@@ -5287,4 +5285,5 @@
             }
             rc = VBOXSTRICTRC_VAL(rcStrict);
+            HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
         }
         else