Improvement to debugger!