Proper localization (issue 6320)