Fix for multiple markers in map