fix font management
Merge pull request #1629 from diegosarmentero/master

fix font management