Workaround lack of support for @ character in locales

Hi, here is my suggested workaround for the known issue.