Fixing oo-diagnostics