better diagnostics