Fixing TOOLS-2391