Fix match_tree