Fixed wizard flow bug