Work with macro in debugging improved