Bug Fix for Scheduler