diff --git a/src/cpu/core_full.cpp b/src/cpu/core_full.cpp
index ec305518..7b4d9753 100644
--- a/src/cpu/core_full.cpp
+++ b/src/cpu/core_full.cpp
@@ -57,6 +57,10 @@ Bitu Full_DeCode(void) {
 	while (CPU_Cycles>0) {
 #if C_DEBUG
 		cycle_count++;
+#if C_HEAVY_DEBUG
+		SaveIP();
+		if (DEBUG_HeavyIsBreakpoint()) return 1;
+#endif
 #endif
 		CPU_Cycles--;
 		inst.entry=cpu.full.entry;