Change the discriminator assignment algorithm to make it more robust.