[BUGFIX] improve the debugger a little