Partial fix to ischedule