Fix issue with locales