fix TOOLS-2504