Wizard workaround