Fix multilingual support