fix CDS parsing