diff --git a/changelog.md b/changelog.md
index 4a9477432..fcbc852ee 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,11 @@
 
 # Changelog #
 
+## Changes in release 6.0.4 ##
++ New payment method: Billie.
++ Enabled mixed cart for subscription orders. Various products could be coupled with a single subscription product.
++ Overall improvements and bug fixes.
+
 ## Changes in release 6.0.3 ##
 + High priority bug fix impacting product add to cart pop-up.
 
diff --git a/subscription/Handler/SubscriptionCreationHandler.php b/subscription/Handler/SubscriptionCreationHandler.php
index 87f5f8d6a..864c0479d 100644
--- a/subscription/Handler/SubscriptionCreationHandler.php
+++ b/subscription/Handler/SubscriptionCreationHandler.php
@@ -40,11 +40,11 @@ public function __construct(
 
     public function handle(Order $order, string $method)
     {
-        $products = $order->getProducts();
+        $products = $order->getCartProducts();
         $subscriptionProduct = [];
 
         foreach ($products as $product) {
-            if (!$this->subscriptionProductValidator->validate((int) $product['product_attribute_id'])) {
+            if (!$this->subscriptionProductValidator->validate((int) $product['id_product_attribute'])) {
                 continue;
             }
 
@@ -65,7 +65,7 @@ private function createRecurringOrdersProduct(array $product): MolRecurringOrder
     {
         $recurringOrdersProduct = new MolRecurringOrdersProduct();
         $recurringOrdersProduct->id_product = $product['id_product'];
-        $recurringOrdersProduct->id_product_attribute = $product['product_attribute_id'];
+        $recurringOrdersProduct->id_product_attribute = $product['id_product_attribute'];
         $recurringOrdersProduct->quantity = $product['product_quantity'];
         $recurringOrdersProduct->unit_price = $product['unit_price_tax_excl'];
         $recurringOrdersProduct->add();