Modify breakpoint approach by step into
Clean and fix