Dirty Hack to fix SetupWizard

Change-Id: I04f2a1f414bb10101bb6d110aaff95a4c77ce67f