Minor improve to localization module