Trying to fix City bug