diff --git a/Base/Model.php b/Base/Model.php
index db41b42..48a5702 100644
--- a/Base/Model.php
+++ b/Base/Model.php
@@ -732,13 +732,15 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 			$value = $this->_attributes[$name] ?? NULL;
 
 			return $this->withPropertyOverride($name, $value);
-		} else if (isset($this->_oldAttributes[$name])) {
+		}
+
+		if (isset($this->_oldAttributes[$name])) {
 			$value = $this->_oldAttributes[$name] ?? NULL;
 
 			return $this->withPropertyOverride($name, $value);
-		} else {
-			return parent::__get($name);
 		}
+
+		return parent::__get($name);
 	}