fixed scheduler bugs