Be little more thorough with localization code