Fix issue with unary ops