timetable workaround added