Fixing localization

Change-Id: Icaf0490a616d127bda965f03cd94863109e1f982