Fix of same issue on text entities