Fixing TOOLS-2598