[WIP] Fixed issues with arabization