diff --git a/app/models/vehicle.rb b/app/models/vehicle.rb
index 82539e8..64ee8c9 100644
--- a/app/models/vehicle.rb
+++ b/app/models/vehicle.rb
@@ -72,7 +72,7 @@ class Vehicle < ActiveRecord::Base
   # Force Upper Case for VIN numbers
   def vin=(val)
     
-    val = val.to_s.gsub!(/[^ABCDEFGHJKLMNPRSTUVWXYZabcdefghjklmnprstuvwxyz0123456789]/,'')
+    val = val.to_s.gsub!(/[^[A-HJ-NPR-Za-hj-npr-z\d]{8}]/,'')
     
     # The to_s is in case you get nil/non-string
     write_attribute(:vin, val.join.upcase)