diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap
index e92fa0835..d741753aa 100644
--- a/src/objects/zcl_abapgit_objects_program.clas.abap
+++ b/src/objects/zcl_abapgit_objects_program.clas.abap
@@ -387,9 +387,12 @@ CLASS ZCL_ABAPGIT_OBJECTS_PROGRAM IMPLEMENTATION.
 
   METHOD deserialize_dynpros.
 
+    CONSTANTS lc_rpyty_force_off TYPE char01 VALUE '/' ##NO_TEXT.
+
     DATA: lv_name   TYPE dwinactiv-obj_name,
           ls_dynpro LIKE LINE OF it_dynpros.
 
+    FIELD-SYMBOLS: <ls_field> TYPE rpy_dyfatc.
 
 * ls_dynpro is changed by the function module, a field-symbol will cause
 * the program to dump since it_dynpros cannot be changed
@@ -399,6 +402,21 @@ CLASS ZCL_ABAPGIT_OBJECTS_PROGRAM IMPLEMENTATION.
         it_flow = ls_dynpro-flow_logic
         it_spaces = ls_dynpro-spaces ).
 
+
+      LOOP AT ls_dynpro-fields ASSIGNING <ls_field>.
+* if the DDIC element has a PARAMETER_ID and the flag "from_dict" is active
+* the import will enable the SET-/GET_PARAM flag. In this case: "force off"
+        IF <ls_field>-param_id IS NOT INITIAL
+           AND <ls_field>-from_dict = abap_true.
+          IF <ls_field>-set_param IS INITIAL.
+            <ls_field>-set_param = lc_rpyty_force_off.
+          ENDIF.
+          IF <ls_field>-get_param IS INITIAL.
+            <ls_field>-get_param = lc_rpyty_force_off.
+          ENDIF.
+        ENDIF.
+      ENDLOOP.
+
       CALL FUNCTION 'RPY_DYNPRO_INSERT'
         EXPORTING
           header                 = ls_dynpro-header
@@ -791,8 +809,6 @@ CLASS ZCL_ABAPGIT_OBJECTS_PROGRAM IMPLEMENTATION.
 
   METHOD serialize_dynpros.
 
-    CONSTANTS lc_rpyty_force_off TYPE char01 VALUE '/' ##NO_TEXT.
-
     DATA: ls_header               TYPE rpy_dyhead,
           lt_containers           TYPE dycatt_tab,
           lt_fields_to_containers TYPE dyfatc_tab,
@@ -852,18 +868,6 @@ CLASS ZCL_ABAPGIT_OBJECTS_PROGRAM IMPLEMENTATION.
         IF sy-subrc = 0 AND <lv_outputstyle> = '  '.
           CLEAR <lv_outputstyle>.
         ENDIF.
-
-* if the DDIC element has a PARAMETER_ID and the flag "from_dict" is active
-* the import will enable the SET-/GET_PARAM flag. In this case force "off"
-*        IF <ls_field>-param_id IS NOT INITIAL
-*           AND <ls_field>-from_dict = abap_true.
-*          IF <ls_field>-set_param IS INITIAL.
-*            <ls_field>-set_param = lc_rpyty_force_off.
-*          ENDIF.
-*          IF <ls_field>-get_param IS INITIAL.
-*            <ls_field>-get_param = lc_rpyty_force_off.
-*          ENDIF.
-*        ENDIF.
       ENDLOOP.
 
       LOOP AT lt_containers ASSIGNING <ls_container>.