Fixing TOOLS-2485