fixed TOOLS-2561