PDE-654 fixed before-date