Avoid unnecessary cds