8.5 schedule fix

Fixes #418.