HPCC-12223 Refined previous commit

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>