Fix for the addressmodel fields