Distributed: minor improvement to keep messages always incremented