fix for TOOLS-2640