+ fix to work with refactoring of operation