Fix instance decision (this commit is truth RC8)