diff --git a/app/src/main/java/com/freshkeeper/service/product/ProductServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/product/ProductServiceImpl.kt
index 0e075db..e8f59e6 100644
--- a/app/src/main/java/com/freshkeeper/service/product/ProductServiceImpl.kt
+++ b/app/src/main/java/com/freshkeeper/service/product/ProductServiceImpl.kt
@@ -83,21 +83,6 @@ class ProductServiceImpl
 
             val cleanedBarcode = barcode?.takeIf { it.isNotBlank() }
 
-            val foodItem =
-                FoodItem(
-                    barcode = cleanedBarcode,
-                    userId = user.id,
-                    householdId = householdId,
-                    name = productName,
-                    expiryTimestamp = expiryTimestamp,
-                    quantity = quantity,
-                    unit = unit,
-                    storageLocation = storageLocation,
-                    category = category,
-                    status = FoodStatus.ACTIVE,
-                    picture = picture,
-                )
-
             val foodItemData =
                 mutableMapOf<String, Any>(
                     "userId" to user.id,
@@ -123,21 +108,31 @@ class ProductServiceImpl
                         .document(documentReference.id)
                         .update("id", documentReference.id)
                         .addOnSuccessListener {
+                            val foodItem = FoodItem(
+                                id = documentReference.id,
+                                barcode = cleanedBarcode,
+                                userId = user.id,
+                                householdId = householdId,
+                                name = productName,
+                                expiryTimestamp = expiryTimestamp,
+                                quantity = quantity,
+                                unit = unit,
+                                storageLocation = storageLocation,
+                                category = category,
+                                status = FoodStatus.ACTIVE,
+                                picture = picture,
+                                daysDifference = daysDifference,
+                            )
                             coroutineScope.launch {
                                 if (user.householdId != null) {
                                     logActivity(
-                                        foodItem.copy(id = documentReference.id),
+                                        foodItem,
                                         productName,
                                         EventType.PRODUCT_ADDED,
                                     )
                                 }
-                                appendToCsv(productName, foodItem.category, context)
-                                onSuccess(
-                                    foodItem.copy(
-                                        id = documentReference.id,
-                                        daysDifference = daysDifference,
-                                    ),
-                                )
+                                appendToCsv(productName, category, context)
+                                onSuccess(foodItem)
                             }
                         }.addOnFailureListener { e -> onFailure(e) }
                 }.addOnFailureListener { e -> onFailure(e) }
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755