bug fixes for rtl