final bug fix google map