fix TOOLS-2502
fix TOOLS-2503