Operands validation fixed