Fixing issue with Localization