Updated version with final fix of the font