Fix breakpoint issue