diff --git a/src/features/planning/components/tools/PlanConstructionCart.vue b/src/features/planning/components/tools/PlanConstructionCart.vue
index f9859604..bfbc1b50 100644
--- a/src/features/planning/components/tools/PlanConstructionCart.vue
+++ b/src/features/planning/components/tools/PlanConstructionCart.vue
@@ -282,6 +282,14 @@
 			}))
 		);
 
+	const xitTransferElementsNeed: ComputedRef<IXITTransferMaterial[]> =
+		computed(() =>
+			totalMaterialsSorted.value.map((e) => ({
+				ticker: e.ticker,
+				value: e.total,
+			}))
+		);
+
 	const refSelectedStorage: Ref<string | undefined> = ref(
 		hasStorage.value
 			? storageOptions.value.filter(
@@ -317,7 +325,7 @@
 	});
 
 	watch(
-		() => xitTransferElementsOverview.value,
+		() => xitTransferElementsNeed.value,
 		async (overview) => {
 			overviewTotalInformation.value = await calculateTotal(overview);
 		},
@@ -532,7 +540,7 @@
 							class="w-62.5!" />
 					</template>
 					<XITTransferActionButton
-						:elements="xitTransferElementsOverview"
+						:elements="xitTransferElementsNeed"
 						transfer-name="Construct"
 						:drawer-width="400" />
 				</div>
diff --git a/src/ui/components/PInputNumber.vue b/src/ui/components/PInputNumber.vue
index a4d03b1f..5c3de967 100644
--- a/src/ui/components/PInputNumber.vue
+++ b/src/ui/components/PInputNumber.vue
@@ -67,17 +67,14 @@
 
 	function canChange(e: number): boolean {
 		if (disabled) return false;
-		if (value.value === null || value.value === undefined) return true;
-
-		if (value.value + e >= min && value.value + e <= max) return true;
+		const currentValue: number = value.value ?? 0;
+		if (currentValue + e >= min && currentValue + e <= max) return true;
 		return false;
 	}
 
 	function change(e: number) {
 		if (canChange(e)) {
-			if (value.value === null || value.value === undefined)
-				value.value = 0;
-			value.value += e;
+			value.value = (value.value ?? 0) + e;
 		}
 	}
 </script>