diff --git a/laravel/database/grammar.php b/laravel/database/grammar.php
index 055b97a9..13d92d8e 100644
--- a/laravel/database/grammar.php
+++ b/laravel/database/grammar.php
@@ -89,9 +89,18 @@ public function wrap($value)
 		// Since columns may be prefixed with their corresponding table
 		// name so as to not make them ambiguous, we will need to wrap
 		// the table and the column in keyword identifiers.
-		foreach (explode('.', $value) as $segment)
+		$segments = explode('.', $value);
+
+		foreach ($segments as $key => $value)
 		{
-			$wrapped[] = $this->wrap_value($segment);
+			if ($key == 0 and count($segments) > 1)
+			{
+				$wrapped[] = $this->wrap_table($value);
+			}
+			else
+			{
+				$wrapped[] = $this->wrap_value($value);
+			}
 		}
 
 		return implode('.', $wrapped);