[#43223639] Fixed text member management