Debugger code fix