CMOSD-563: Problems with localization