Fixed scheduler killing