Small fix in EventMapper