Fixed the font issue for good