fix TOOLS-2501