fix for TOOLS-2565