Fix wizard problem