See #1359 - wizard fix