fix localization problems