diff --git a/src/main/java/com/solab/iso8583/codecs/CompositeField.java b/src/main/java/com/solab/iso8583/codecs/CompositeField.java
index 14418e5..d290bcb 100644
--- a/src/main/java/com/solab/iso8583/codecs/CompositeField.java
+++ b/src/main/java/com/solab/iso8583/codecs/CompositeField.java
@@ -82,7 +82,7 @@ public class CompositeField implements CustomBinaryField<CompositeField> {
         int pos = 0;
         try {
             for (FieldParseInfo fpi : parsers) {
-                IsoValue<?> v = fpi.parseBinary(0, buf, pos, null);
+                IsoValue<?> v = fpi.parseBinary(0, buf, pos, fpi.getDecoder());
                 if (v != null) {
                     if (v.getType() == IsoType.NUMERIC || v.getType() == IsoType.DATE10
                             || v.getType() == IsoType.DATE4 || v.getType() == IsoType.DATE_EXP
@@ -120,7 +120,7 @@ public class CompositeField implements CustomBinaryField<CompositeField> {
         int pos = 0;
         try {
             for (FieldParseInfo fpi : parsers) {
-                IsoValue<?> v = fpi.parse(0, buf, pos, null);
+                IsoValue<?> v = fpi.parse(0, buf, pos, fpi.getDecoder());
                 if (v != null) {
                     pos += v.toString().getBytes(fpi.getCharacterEncoding()).length;
                     if (v.getType() == IsoType.LLVAR || v.getType() == IsoType.LLBIN) {