Guanako: Added FixedTreeSet to work around a memory leak