cdw: u2d fix