[FIX] RT-1959 #Finish
Merge pull request #1324 from annatonger/fix/textfix7

[FIX] RT-1959 #Finish