Breakpoint fix