Fixed font issues with a hack -- attempt 2