diff --git a/commerce_bulk.module b/commerce_bulk.module
index 368e8ac..5081208 100644
--- a/commerce_bulk.module
+++ b/commerce_bulk.module
@@ -47,7 +47,7 @@ function commerce_bulk_field_widget_form_alter(&$element, FormStateInterface $fo
       /** @var \Drupal\commerce_bulk\BulkVariations $bulk */
       $creator = \Drupal::service('commerce_bulk.variations_creator');
       /** @var \Drupal\commerce_product\Entity\Product $product */
-      $product = $form_state->getFormObject()->getEntity();
+      $product = $context['items']->getEntity();
       /** @var \Drupal\commerce_product\Entity\ProductVariation $variation */
       $variation = $creator->getProductVariation($product);
       $sku_settings = $creator::getSkuwidget($variation)->getSettings();
@@ -147,6 +147,7 @@ function commerce_bulk_field_widget_form_alter(&$element, FormStateInterface $fo
               '#submit' => [[$creator, 'createAllIefFormVariations']],
               '#value' => $value,
               '#weight' => 10,
+              '#ief_id' => $id,
               '#attributes' => [
                 'title' => $not_all && $all['used'] > $not_all ? $warning : $description,
               ],
diff --git a/src/BulkVariationsCreator.php b/src/BulkVariationsCreator.php
index 3fa9218..60424f8 100644
--- a/src/BulkVariationsCreator.php
+++ b/src/BulkVariationsCreator.php
@@ -107,7 +107,7 @@ class BulkVariationsCreator implements BulkVariationsCreatorInterface {
     $variation = end($variations);
     $timestamp = time();
     if (!$variation instanceof ProductVariation) {
-      $variation = $this->entityTypeManager->getStorage('commerce_product_variation')->create([
+      $variation = \Drupal::entityTypeManager()->getStorage('commerce_product_variation')->create([
         'type' => $product->getFieldDefinition('variations')->getSettings()['handler_settings']['target_bundles'][0],
         'created' => $timestamp,
         'changed' => $timestamp,
@@ -207,7 +207,7 @@ class BulkVariationsCreator implements BulkVariationsCreatorInterface {
     // BulkVariationsCreator as an AJAX callback therefore forcing to use
     // just the class name instead of object and define all functions as static.
     $this->entityTypeManager = NULL;
-    $ief_id = $form['variations']['widget']['#ief_id'];
+    $ief_id = $form_state->getTriggeringElement()['#ief_id'];
     $ief_entities = $form_state->get(['inline_entity_form', $ief_id, 'entities']) ?: [];
     if (!$all = $this->getAttributesCombinations(array_column($ief_entities, 'entity'))) {
       return;