WEB-2904 Internationalization fix