Fixing TOOLS-2403