UX fix for #148