System: SetupWizard Fix