Updated breakpoint stop matcher