Fixed map API issue