fixing TOOLS-2613