Change behaviour of OpDiagnoseOS w.r.t. 'valid'