#852 more localization