Fix UnitObject commutativity bug