fixed wizard handler