Fixed Breakpoint bug