expiry_date comparison fix