fix for event mapping problems