Fix for computing an expiry without rollover.