diff --git a/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java b/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
index 36a905a06c8570d06f74fa5400b1cc6e09fcb5a1..02d0f1e8132a83177a437c9c615fd6364b1a32bd 100644
--- a/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatarsec/TML2Avatar.java
@@ -1456,22 +1456,22 @@ public class TML2Avatar {
                                         Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
                                         secChannelMap.put(ch, tmp);
                                     }
+                                    if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
+                                        Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
+                                        wrPragmaMap.put((TMLWriteChannel) ae, tmp);
+                                    }
                                     boolean isAvSecretInSet = false;
                                     for (AvatarPragma av : secChannelMap.get(ch)) {
                                         if (av.getName().equals(avPragmaSecret.getName())) {
                                             isAvSecretInSet = true;
+                                            wrPragmaMap.get((TMLWriteChannel) ae).add(av);
                                             break;
                                         }
                                     }
                                     if (!isAvSecretInSet) {
                                         secChannelMap.get(ch).add(avPragmaSecret);
+                                        wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
                                     }
-
-                                    if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
-                                        Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
-                                        wrPragmaMap.put((TMLWriteChannel) ae, tmp);
-                                    }
-                                    wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
                                 }
                             }
                         }
@@ -1485,22 +1485,22 @@ public class TML2Avatar {
                                 Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
                                 secChannelMap.put(ch, tmp);
                             }
+                            if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
+                                Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
+                                wrPragmaMap.put((TMLWriteChannel) ae, tmp);
+                            }
                             boolean isAvSecretInSet = false;
                             for (AvatarPragma av : secChannelMap.get(ch)) {
                                 if (av.getName().equals(avPragmaSecret.getName())) {
                                     isAvSecretInSet = true;
+                                    wrPragmaMap.get((TMLWriteChannel) ae).add(av);
                                     break;
                                 }
                             }
                             if (!isAvSecretInSet) {
                                 secChannelMap.get(ch).add(avPragmaSecret);
+                                wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
                             }
-
-                            if (!wrPragmaMap.containsKey((TMLWriteChannel) ae)) {
-                                Set<AvatarPragma> tmp = new HashSet<AvatarPragma>();
-                                wrPragmaMap.put((TMLWriteChannel) ae, tmp);
-                            }
-                            wrPragmaMap.get((TMLWriteChannel) ae).add(avPragmaSecret);
                         }
                     }
                 }