Fixed issue with various locales not working.