Fix some issue with the text