diff --git a/ASTree.cpp b/ASTree.cpp
index 860a637..207cf07 100644
--- a/ASTree.cpp
+++ b/ASTree.cpp
@@ -1722,6 +1722,13 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
                             mod->verCompare(3, 11) >= 0 ? code->qualName()->value() : code->name()->value());
                     }
                 }
+                // BEGIN ONESHOT TEMPORARY PATCH
+                // The problem is not here, but in the way the blocks are created
+                // Add this to avoid segfault
+                if (blocks.top() == defblock)
+                    break;
+                // END ONESHOT PATCH
+
                 PycRef<ASTBlock> tmp = curblock;
                 blocks.pop();