Bug fix on map icon loading