fix for TOOLS-2441