Add stop for v6 too