Fix: Right to left support