Fix for evaluation schedule bug.
Merge branch 'temp'