Fixing TOOLS-2384

Signed-off-by: Melan Nimesh <melan@apache.org>