fix for TOOLS-2600