Added another bounds check for city, please work