Better breakpoint handling