gmap final fix