Reapply date fix from @subtleq