Finally fixed wandering tree entries