Fix Font issue