fixup! Use index to guarantee uniqueness for virtual features