bugfix for change_instance