Fixed (properly) scheduling logic