fixed minor bug with maps and event model