Fixing TOOLS 2476