[C 21.5] REVISED patch for #'cd