Fix self_supplier