Fixed breaking bug with the skipped event