fix to first event selection