Fix wizard for 6.2