diff --git a/application/language/en/validation.php b/application/language/en/validation.php
index edd77e71..a8e6d3c6 100644
--- a/application/language/en/validation.php
+++ b/application/language/en/validation.php
@@ -39,27 +39,35 @@
 	"alpha"          => "The :attribute may only contain letters.",
 	"alpha_dash"     => "The :attribute may only contain letters, numbers, and dashes.",
 	"alpha_num"      => "The :attribute may only contain letters and numbers.",
-	"between"        => "The :attribute must be between :min - :max.",
-	"between.file"   => "The :attribute must be between :min - :max kilobytes.",
-	"between.string" => "The :attribute must be between :min - :max characters.",
+	"between"        => array(
+		"numeric" => "The :attribute must be between :min - :max.",
+		"file"    => "The :attribute must be between :min - :max kilobytes.",
+		"string"  => "The :attribute must be between :min - :max characters.",
+	),
 	"confirmed"      => "The :attribute confirmation does not match.",
 	"email"          => "The :attribute format is invalid.",
 	"image"          => "The :attribute must be an image.",
 	"in"             => "The selected :attribute is invalid.",
 	"integer"        => "The :attribute must be an integer.",
-	"max"            => "The :attribute must be less than :max.",
-	"max.file"       => "The :attribute must be less than :max kilobytes.",
-	"max.string"     => "The :attribute must be less than :max characters.",
+	"max"            => array(
+		"numeric" => "The :attribute must be less than :max.",
+		"file"    => "The :attribute must be less than :max kilobytes.",
+		"string"  => "The :attribute must be less than :max characters.",
+	),
 	"mimes"          => "The :attribute must be a file of type: :values.",
-	"min"            => "The :attribute must be at least :min.",
-	"min.file"       => "The :attribute must be at least :min kilobytes.",
-	"min.string"     => "The :attribute must be at least :min characters.",
+	"min"            => array(
+		"numeric" => "The :attribute must be at least :min.",
+		"file"    => "The :attribute must be at least :min kilobytes.",
+		"string"  => "The :attribute must be at least :min characters.",
+	),
 	"not_in"         => "The selected :attribute is invalid.",
 	"numeric"        => "The :attribute must be a number.",
 	"required"       => "The :attribute field is required.",
-	"size"           => "The :attribute must be :size.",
-	"size.file"      => "The :attribute must be :size kilobyte.",
-	"size.string"    => "The :attribute must be :size characters.",
+	"size"           => array(
+		"numeric" => "The :attribute must be :size.",
+		"file"    => "The :attribute must be :size kilobyte.",
+		"string"  => "The :attribute must be :size characters.",
+	),
 	"unique"         => "The :attribute has already been taken.",
 	"url"            => "The :attribute format is invalid.",
 
diff --git a/laravel/validation/validator.php b/laravel/validation/validator.php
index 61043063..6f21f9f9 100644
--- a/laravel/validation/validator.php
+++ b/laravel/validation/validator.php
@@ -534,9 +534,16 @@ protected function message($attribute, $rule)
 		// If the rule being validated is a "size" rule and the attribute is not
 		// a number, we will need to gather the specific size message for the
 		// type of attribute being validated, either a file or a string.
-		elseif (isset($this->size_rules[$rule]) and ! $this->has_rule($attribute, $this->numeric_rules))
+		elseif (in_array($rule, $this->size_rules))
 		{
-			$line = (array_key_exists($attribute, Input::file())) ? "file" : "string";
+			if ($this->has_rule($attribute, $this->numeric_rules))
+			{
+				$line = 'numeric';
+			}
+			else
+			{
+				$line = (array_key_exists($attribute, Input::file())) ? 'file' : 'string';
+			}
 
 			return Lang::line("validation.{$rule}.{$line}")->get($this->language);
 		}