fixing multilingual support