Fix for issue 1 - SchedulerStatic