Event data for mapping needs fixing