expiration time fixes