Issue 580 scheduler