Fix discriminator relation / error