Improve localization handling