fixing TOOLS-2621