fix for TOOLS-2544