Fixing TOOLS-2584