fix for TOOLS-2644