improve rtl support