small modification for GMAP