Fix wizzard. closes #1971