1 files changed, 4 insertions, 2 deletions
diff --git a/state.cpp b/state.cpp
index 2f1990b..16a573e 100644
--- a/state.cpp
+++ b/state.cpp
@@ -40,7 +40,7 @@ void State::compiling(bool yes)
 
 void State::execute(Addr addr)
 {
-    if (addr < Dictionary::Begin) {
+    if (addr < CoreWords::WordCount) {
         // Must be a core-word
         CoreWords::run(addr, *this);
     } else {
@@ -51,7 +51,9 @@ void State::execute(Addr addr)
             ip += sizeof(Cell);
 
             const auto ins = dict.read(ip);
-            if (!CoreWords::run(ins, *this)) {
+            if (ins < CoreWords::WordCount) {
+                CoreWords::run(ins, *this);
+            } else {
                 pushr(ip);
                 ip = ins - sizeof(Cell);
             }