modified debugger handlers