#JC-1854 - Fixed localization