diff --git a/hscript/CustomClass.hx b/hscript/CustomClass.hx
index 3e88614..e629551 100644
--- a/hscript/CustomClass.hx
+++ b/hscript/CustomClass.hx
@@ -175,6 +175,7 @@ class CustomClass implements IHScriptCustomClassBehaviour {
 		if (f != null && allowProperty && f is Property) {
 			var prop:Property = cast f;
 			prop.__allowSetGet = this.__allowSetGet;
+			prop.__callingProperty = true;
 			var r = prop.callGetter();
 			prop.__allowSetGet = null;
 			return r;
@@ -187,6 +188,7 @@ class CustomClass implements IHScriptCustomClassBehaviour {
 		if (f != null && f is Property) {
 			var prop:Property = cast f;
 			prop.__allowSetGet = this.__allowSetGet;
+			prop.__callingProperty = true;
 			var r = prop.callSetter(val);
 			prop.__allowSetGet = null;
 			return r;
@@ -354,6 +356,7 @@ class CustomClass implements IHScriptCustomClassBehaviour {
 		return cls;
 	}
 
+	// TODO: scriptable "toString" function
 	public function toString():String
 		return className;
 }
diff --git a/hscript/CustomClassHandler.hx b/hscript/CustomClassHandler.hx
index eef13f7..6844aab 100644
--- a/hscript/CustomClassHandler.hx
+++ b/hscript/CustomClassHandler.hx
@@ -97,6 +97,7 @@ class CustomClassHandler implements IHScriptCustomConstructor implements IHScrip
         if(f is Property && allowProperty) {
             var prop:Property = cast f;
             prop.__allowSetGet = this.__allowSetGet;
+			prop.__callingProperty = true;
             var r = prop.callGetter();
             prop.__allowSetGet = null;
             return r;
@@ -109,6 +110,7 @@ class CustomClassHandler implements IHScriptCustomConstructor implements IHScrip
         if(f is Property) {
             var prop:Property = cast f;
             prop.__allowSetGet = this.__allowSetGet;
+			prop.__callingProperty = true;
             var r = prop.callSetter(val);
             prop.__allowSetGet = null;
             return r;