Fix parsing code for DCM function > 8 and DC2wq