diff --git a/meddfnprs.rpgle b/meddfnprs.rpgle
index 5d6aa81..3a901b0 100644
--- a/meddfnprs.rpgle
+++ b/meddfnprs.rpgle
@@ -28,6 +28,9 @@ dcl-pr MD_ParseRetrieveBuffer;
       char(32767) const
       options(*varsize);
 
+   ReceiverLength
+      int(10) const;
+
    MediaDefinition
       likeds(MD_MediaDefinition_T);
 
@@ -62,6 +65,9 @@ dcl-proc MD_ParseRetrieveBuffer export;
          char(32767) const
          options(*varsize);
 
+      ReceiverLength
+         int(10) const;
+
       MediaDefinition
          likeds(MD_MediaDefinition_T);
 
@@ -89,9 +95,6 @@ dcl-proc MD_ParseRetrieveBuffer export;
    // Working variables
    //==================================================================
 
-   dcl-s ReceiverLength
-      int(10);
-
    dcl-s DeviceOffset
       int(10);
 
@@ -121,8 +124,6 @@ dcl-proc MD_ParseRetrieveBuffer export;
    clear MediaDefinition;
    clear Error;
 
-   ReceiverLength = %len(ReceiverBuffer);
-
 
    //==================================================================
    // Receiver buffer
diff --git a/meddfnsrv.rpgle b/meddfnsrv.rpgle
index a31de94..1f2ce43 100644
--- a/meddfnsrv.rpgle
+++ b/meddfnsrv.rpgle
@@ -18,6 +18,7 @@
 //
 //=====================================================================
 
+
 ctl-opt
    option(*srcstmt:*nodebugio)
    nomain;
@@ -558,6 +559,7 @@ dcl-proc MD_RetrieveMediaDefinition export;
 
    MD_ParseRetrieveBuffer(
       Receiver.Data :
+      ApiReceiverLength :
       MediaDefinition :
       Error);
 
diff --git a/meddfntstx.rpgle b/meddfntstx.rpgle
index a57a892..0695277 100644
--- a/meddfntstx.rpgle
+++ b/meddfntstx.rpgle
@@ -15,11 +15,11 @@
 //           DBGVIEW(*SOURCE)
 //           TGTRLS(*CURRENT)
 //
-// CRTPGM PGM(GOSCH1/MEDDFNTSTX)
-//        MODULE(GOSCH1/MEDDFNTSTX)
-//        MODULE(GOSCH1/MEDDFNPRS)
-//        ACTGRP(*NEW)
-//        TGTRLS(*CURRENT)
+//  CRTPGM PGM(GOSCH1/MEDDFNTSTX)                           
+//        MODULE(GOSCH1/MEDDFNTSTX GOSCH1/MEDDFNPRS)       
+//        ACTGRP(*NEW)                                     
+//        TGTRLS(*CURRENT)                                 
+// 
 //
 //=====================================================================