Bug fix for arabic display issue