Hpcc 11872 fix