Fixed scheduler issue