more RTL sepeation and fix