fix for TOOLS-2649