Hpcc 11640 fix