diff --git a/prototype/src/main/java/org/hso/ecommerce/action/user/CreateDeliveryData.java b/prototype/src/main/java/org/hso/ecommerce/action/user/CreateDeliveryData.java
index 64dcef7..53673e1 100644
--- a/prototype/src/main/java/org/hso/ecommerce/action/user/CreateDeliveryData.java
+++ b/prototype/src/main/java/org/hso/ecommerce/action/user/CreateDeliveryData.java
@@ -10,7 +10,6 @@ import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.UUID;
 
 public class CreateDeliveryData {
 
@@ -21,7 +20,7 @@ public class CreateDeliveryData {
 
         if(customerOrder.deliveredAt == null)
         {
-            DeliveryData deliveryData = restServiceForDelivery.getDeliveryData(UUID.fromString(customerOrder.trackingId));
+            DeliveryData deliveryData = restServiceForDelivery.getDeliveryData(customerOrder.trackingId);
 
 
             if(deliveryData.isDelivered())
diff --git a/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java b/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
index 3d4f9ce..6dcadcc 100644
--- a/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
+++ b/prototype/src/main/java/org/hso/ecommerce/api/RestServiceForDelivery.java
@@ -6,13 +6,13 @@ import org.hso.ecommerce.uimodel.DeliveryDataEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
-
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class RestServiceForDelivery {
@@ -49,7 +49,7 @@ public class RestServiceForDelivery {
         }
     }
 
-    public DeliveryData getDeliveryData(UUID trackingID) {
+    public DeliveryData getDeliveryData(String trackingID) {
 
         String url = DELIVERY_IP_ADDRESS + "/status";
 
@@ -58,7 +58,7 @@ public class RestServiceForDelivery {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url).queryParam("trackingID",trackingID.toString());
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url).queryParam("trackingID", trackingID);
 
         HttpEntity<?> entity = new HttpEntity<>(headers);