Avoid possible erroneous rollout mismatches