Fixed font issues with a hack