Change the way expiration is calculated to be more explicit