J: check 1: refactored Operator type!
J
J: check 1: error message fixed