Fixing TOOLS-2497