fix for TOOLS-2575