re #787 - Fixed un-scheduling