fix for TOOLS-2610