Multi-lingual fix