diff --git a/src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php b/src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php
index 077b7bb..2f516fc 100644
--- a/src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php
+++ b/src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php
@@ -48,10 +48,12 @@ public function select($statements)
         if (isset($statements['tables'])) {
             $tables = [];
 
-            foreach ($statements['tables'] as $prefix => $table) {
+            foreach ($statements['tables'] as $table) {
 
-                if (is_numeric($prefix) === false) {
-                    $t =  $t = ($table instanceof Raw) ? $prefix : '`' . $prefix . '` AS ' . strtolower($table);
+                $prefix = isset($statements['aliases'][$table]) ? $statements['aliases'][$table] : null;
+
+                if ($prefix !== null) {
+                    $t = ($table instanceof Raw) ? $table : '`' . $table . '` AS ' . strtolower($prefix);
                 } else {
                     $t = ($table instanceof Raw) ? $table : '`' . $table . '`';
                 }
diff --git a/src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php b/src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php
index be8f6ca..896d9d4 100644
--- a/src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php
+++ b/src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php
@@ -142,7 +142,7 @@ public function query($sql, array $bindings = [])
      */
     public function alias($table, $alias)
     {
-        $this->statements['tables'][$this->tablePrefix . $table] =  strtolower($alias);
+        $this->statements['aliases'][$this->tablePrefix . $table] = strtolower($alias);
         return $this;
     }