Font hacking again (Fixes #1506)