diff --git a/Zend/tests/frameless_bug_001.phpt b/Zend/tests/frameless_bug_001.phpt
new file mode 100644
index 00000000000..62c02e79883
--- /dev/null
+++ b/Zend/tests/frameless_bug_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Frameless bug 001
+--FILE--
+<?php
+
+namespace NS;
+
+class Test {
+    public function test() {
+        return preg_match('foo', 'bar');
+    }
+}
+
+$test = new Test();
+$test->test();
+
+?>
+--EXPECTF--
+Warning: preg_match(): Delimiter must not be alphanumeric, backslash, or NUL byte in %s on line %d
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index c297523b924..5e0d0567cd7 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -507,7 +507,7 @@ ZEND_API const char *get_active_class_name(const char **space) /* {{{ */
 		return "";
 	}
 
-	func = EG(current_execute_data)->func;
+	func = zend_active_function();
 
 	switch (func->type) {
 		case ZEND_USER_FUNCTION: