Yet one more improvement with respect to debugger