fixed issue with expiration times