Hopefully better handling of custom fonts