Fix broken Avro shuffle cstep.