Fixed issue with unary minus and operations