Fix for tree