Tiny improvement for debug mod