Finally fixed all the localization