Tightened up diode pinging