Fixed bug with stale scheduling