fixing TOOLS-2386