fix #3643 (get PFS and CD to agree)