Bug fix for debugger