Fixed: zip code is reset to the default