Fixed bugs with nextup events