Better support for bigger font sizes