[FIX] RT-1959 #Finish
Merge pull request #1325 from annatonger/fix/textfix8

[FIX] RT-1959 #Finish