[FIX] RT-1959 #Deliver
Merge pull request #1323 from annatonger/fix/textfix6

[FIX] RT-1959 #Deliver