deal with tiny branches more carefully