diff --git a/core/cpu.c b/core/cpu.c
index 386ddd2..ce856de 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -1636,7 +1636,8 @@ static void cpuSUBF_S(VB *sim) {
 
 /* TRAP */
 static void cpuTRAP(VB *sim) {
-    cpuAdvance(sim, cpuClocks(15));
+    sim->cpu.clocks += cpuClocks(15);
+    sim->cpu.pc     += 2;
     cpuThrow(sim, 0xFFA0 + cpuGetImm5U(sim));
 }