fix localization bugs