Fix for Google map issue