final update for fixing font issue