Also fix #3209 on initial wizard