fixed diagnostics