Debugger bug fix