Fix broken needs diag. option; needs testing

(#1823)