Fix for bug introduced in scheduling changes