#442 Improve and operation handling