Fixing TOOLS-2427