GMAP FIX
merged