Fix variant / variant id confusion.