Fix to support dependency variants.