get the diag message right