Handle deleted items better.