Fix wizzard. closes #2133