Fix semantic issue with expiration dates