Fixed breakpoint handling (issue #16)