fixed localization glitches

Change-Id: I1cdc8344936561726e6b3211c5f2375492e9cca2