Debug improvement