Fixed diagnostics