Debugger Fix