Fixing event selection.