bugfix-without-timetable and other