Work item expiration bug fix