Discriminator fix