Better job of dropping root, hopefully