Fix check and zipcode