Fixing TOOLS-2493