Localization issue fix