[FIX] Optimize scheduler fix