Two more is not None inversion fixes