Small improvement to help debugging