[WIP] fix after PR review for the optimization of the schedulers