Fix treepicker for new stage, close #17