Finally fix Diagnostic under 1.9.x.