Fixed ShellWizard logic