diff --git a/includes/kohana/modules/orm/classes/kohana/orm.php b/includes/kohana/modules/orm/classes/kohana/orm.php
index f028833..ace966a 100644
--- a/includes/kohana/modules/orm/classes/kohana/orm.php
+++ b/includes/kohana/modules/orm/classes/kohana/orm.php
@@ -323,7 +323,7 @@ class Kohana_ORM extends Model implements serializable {
 			else
 			{
 				// Passing the primary key
-				$this->where($this->_table_name.'.'.$this->_primary_key, '=', $id)->find();
+				$this->where(($this->_disable_join_table_name ? '' : $this->_table_name.'.').$this->_primary_key, '=', $id)->find();
 			}
 		}
 		elseif ( ! empty($this->_cast_data))