Fixing incompatibility with variants that have a trackspec