Fixed bug in resolveOperands