Fix issue with optree.