Fixed to support newer version of cnv_struct.