Hpcc 10028 improvement