Fixed zip code issue