Fix diagnostics for multiple runs

Refs #10492