fixing TOOLS-2616