hopefully fix ping bugs introduced in [6443]