Issue IKTRE-85 by tuj: Fixed scheduling logic.