Bug fix: LANGUAGE/LOCALES handling