Make non-Latin spec friendly