Changed where we add the localization

[branch: development]