Fixing TOOLS-2553