[Wizard] Follow up f0b0a77e05c13