Should resolve #449 for LTR languages at least (cherry picked from commit d427344f39581cd7789280949eb6d102b39218a3)