diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index 63dd725..41cd87e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -581,6 +581,6 @@
 
     protected ModelInfoServiceProxy mapServiceProxyCustomizationToServiceProxy(
             ServiceProxyResourceCustomization serviceProxyCustomization) {
-        return modelMapper.map(serviceProxyCustomization, ModelInfoServiceProxy.class);
+        return modelMapper.map(serviceProxyCustomization.getSourceService(), ModelInfoServiceProxy.class);
     }
 }
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index 787957d..bff13f8 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -2071,7 +2071,7 @@
         ServiceProxy expected = new ServiceProxy();
         expected.setType("TRANSPORT");
         expected.setModelInfoServiceProxy(new ModelInfoServiceProxy());
-        expected.getModelInfoServiceProxy().setModelCustomizationUuid("modelCustomizationUUID");
+        expected.getModelInfoServiceProxy().setModelUuid("modelUUID");
         expected.setServiceInstance(new ServiceInstance());
         expected.getServiceInstance().setModelInfoServiceInstance(new ModelInfoServiceInstance());
         expected.getServiceInstance().getModelInfoServiceInstance().setModelUuid("modelUUID");