Hpcc 9867 fix