LocalizationHelper fixes