Fixed issue with upcoming timeslot