Fixing TOOLS-2582-refactoring