fixed localization issues