Fix multi-language handling