Fix for text issues