Fixing TOOLS-2451