Dirty Hack to fix SetupWizard

Change-Id: I84fc8f59619674ebeb6191db0ccdbc2dc2f9aab8