Fixed mapAssistant