Fix same expiration_date bug