Localization support fix