Debugging improvement