Fix for locales including underscore