Fixed broken breakpoint catching