diff --git a/src/vm.rs b/src/vm.rs
index 14beb69..6bc21b9 100644
--- a/src/vm.rs
+++ b/src/vm.rs
@@ -139,8 +139,8 @@ impl Uxn {
                 // The value of PC is defined to be the value of the NEXT pc ala Mips
                 self.pc += 1;
 
-                // Short circuit for fast NOP
-                if icode == Icode::NOP {
+                // Short circuit for cheap NOPs (POPk, POPkr)
+                if icode & Icode::NOP == Icode::NOP {
                     return Ok(());
                 }