Fix issue with Expiration Required.