Improve debugger behaviour