Fixed Scheduling issue