Brave design change attempt to fix #75