fix management of operation scheduling