fix TOOLS-2500