diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
index cf2776b7c..3051c0f32 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
@@ -134,9 +134,14 @@ public class RegistryDepoBuilder implements IRegistryBuilder {
         } else if (regDsgn.equals(RegistryDesignation.O)) {
             reg.setSettledDebit((execDep).getFirstLegAmount());
         }
-        reg.setSettlementDate(execDep.getFirstLegSettlementDate()); //fixme add second leg code branch
-        reg.setSettlementCode(execDep.getFirstLegSettlementCode()); //fixme add second leg code branch
-        reg.setRefundDate(execDep.getSecondLegSettlementDate()); //fixme add second leg code branch??
+        if (secondLeg) {
+            reg.setSettlementDate(execDep.getSecondLegSettlementDate());
+            reg.setSettlementCode(execDep.getSecondLegSettlementCode());
+        } else {
+            reg.setSettlementDate(execDep.getFirstLegSettlementDate());
+            reg.setSettlementCode(execDep.getFirstLegSettlementCode());
+        }
+        reg.setRefundDate(execDep.getSecondLegSettlementDate());
         reg.setValueDate(execDep.getFirstLegSettlementDate());
         reg.setContract(execDep.getContract());
         reg.setTradingDate(exec.getTradingDate());