diff --git a/app/models/vehicle.rb b/app/models/vehicle.rb
index c0fe620..82539e8 100644
--- a/app/models/vehicle.rb
+++ b/app/models/vehicle.rb
@@ -71,8 +71,11 @@ class Vehicle < ActiveRecord::Base
   
   # Force Upper Case for VIN numbers
   def vin=(val)
+    
+    val = val.to_s.gsub!(/[^ABCDEFGHJKLMNPRSTUVWXYZabcdefghjklmnprstuvwxyz0123456789]/,'')
+    
     # The to_s is in case you get nil/non-string
-    write_attribute(:vin, val.to_s.gsub!(/[^ABCDEFGHJKLMNPRSTUVWXYZabcdefghjklmnprstuvwxyz0123456789]/, '').join.upcase)
+    write_attribute(:vin, val.join.upcase)
   end
   
   # search for a vin