InfoWindow fix