fixes #18 (Diagnostics)