Fixed diagnostics to work with new relay method