Mapper Dispatch event fix