1 files changed, 12 insertions, 7 deletions
diff --git a/state.cpp b/state.cpp
index 0fe0905..6d056ba 100644
--- a/state.cpp
+++ b/state.cpp
@@ -40,13 +40,18 @@ void State::compiling(bool yes)
 
 void State::execute(Addr addr)
 {
-    pushr(0);
-    ip = addr - sizeof(Cell);
-
-    do {
-        ip += sizeof(Cell);
-        CoreWords::run(dict.read(ip), *this);
-    } while (ip);
+    if (addr < Dictionary::Begin) {
+        // Must be a core-word
+        CoreWords::run(addr, *this);
+    } else {
+        pushr(0);
+        ip = addr - sizeof(Cell);
+
+        do {
+            ip += sizeof(Cell);
+            CoreWords::run(dict.read(ip), *this);
+        } while (ip);
+    }
 }
 
 Cell State::beyondip() const