Fixed bug with expiration not being updated properly.