Scheduler: fixing navigation issue; #116