Fixed tree saving for real this time