HPCC-8717 Revised based on the last comment

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>