Fix for postal code problems