fix for TOOLS-2664
fix for TOOLS-2665