Fix #121 by reducing Tree generation (thanks to @etorreborre)