Fixing collection event bug