[FIX] RT-1959 #Delivered
Merge pull request #1321 from annatonger/fix/textfix3

[FIX] RT-1959 #Delivered