C2: added Diagnostic