full fix RTL support