Repair with single steps and breakpoints
