Fix scheduling issue

Added a commit after CR (whilst this was already merged.)