fix the gmap issue