Moving bp auto-correction logic to debuggerTool