diff --git a/forms/Form.php b/forms/Form.php
index 7adb2af8e..48659b58d 100755
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -1296,6 +1296,6 @@ class Form_FieldMap extends ViewableData {
 	}
 
 	function __call($method, $args = null) {
-		return $this->form->dataFieldByName($method);
+		return $this->form->Fields()->fieldByName($method);
 	}
 }