fix on instance conflicts