[distributed, master] Fixed Scheduler handling