diff --git a/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.js b/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.js
index a034755e..1606dfff 100644
--- a/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.js
+++ b/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.js
@@ -28,26 +28,29 @@ class UnicodeArrayCallsWrapper extends Node_1.Node {
         return super.getNode();
     }
     getNodeStructure() {
-        let environmentName = Utils_1.Utils.getRandomVariableName(), keyName = Utils_1.Utils.getRandomVariableName(), selfDefendingCode = '', node;
+        let code = '', environmentName = Utils_1.Utils.getRandomVariableName(), keyName = Utils_1.Utils.getRandomVariableName(), node;
         if (this.options['selfDefending']) {
-            selfDefendingCode = `
+            code = `
                 var ${environmentName} = function(){return ${Utils_1.Utils.stringToUnicode('production')};};
                                                                       
                 if (
                     ${keyName} % ${Utils_1.Utils.getRandomInteger(this.unicodeArray.length / 8, this.unicodeArray.length / 2)} === 0 &&
                     /\\w+ *\\(\\) *{\\w+ *['|"].+['|"];? *}/.test(
                         ${environmentName}[${Utils_1.Utils.stringToUnicode('toString')}]()
-                    ) !== true && ${keyName}++
+                    ) === true || ${keyName}++
                 ) {
-                    return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]
+                    return ${this.unicodeArrayName}[parseInt(${keyName}, 16)];
                 }
+                
+                return ${this.unicodeArrayName}[parseInt(${keyName}, 16)];
             `;
         }
+        else {
+            code = `return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]`;
+        }
         node = esprima.parse(`
             var ${this.unicodeArrayCallsWrapperName} = function (${keyName}) {
-                ${selfDefendingCode}
-                
-                return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]
+                ${code}
             };
         `);
         NodeUtils_1.NodeUtils.addXVerbatimPropertyToLiterals(node);
diff --git a/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.js b/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.js
index 5374a24c..7453fe2d 100644
--- a/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.js
+++ b/dist/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.js
@@ -26,9 +26,9 @@ class UnicodeArrayDecodeNode extends Node_1.Node {
     }
     getNodeStructure() {
         const environmentName = Utils_1.Utils.getRandomVariableName(), indexVariableName = Utils_1.Utils.getRandomVariableName(), tempArrayName = Utils_1.Utils.getRandomVariableName();
-        let node, selfDefendingCode = '';
+        let code = '', node;
         if (this.options['selfDefending']) {
-            selfDefendingCode = `
+            code = `
                 var ${environmentName} = function(){return ${Utils_1.Utils.stringToUnicode('dev')};};
                                         
                 if (
@@ -67,7 +67,7 @@ class UnicodeArrayDecodeNode extends Node_1.Node {
                 var ${tempArrayName} = [];
                 
                 for (var ${indexVariableName} in ${this.unicodeArrayName}) {
-                    ${selfDefendingCode}
+                    ${code}
                 
                     ${tempArrayName}[${Utils_1.Utils.stringToUnicode('push')}](decodeURI(atob(${this.unicodeArrayName}[${indexVariableName}])));
                 }
diff --git a/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.ts b/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.ts
index d58629b7..de0c2bf8 100644
--- a/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.ts
+++ b/src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.ts
@@ -84,31 +84,33 @@ export class UnicodeArrayCallsWrapper extends Node {
      * @returns {INode}
      */
     protected getNodeStructure (): INode {
-        let environmentName: string = Utils.getRandomVariableName(),
+        let code: string = '',
+            environmentName: string = Utils.getRandomVariableName(),
             keyName: string = Utils.getRandomVariableName(),
-            selfDefendingCode: string = '',
             node: INode;
 
         if (this.options['selfDefending']) {
-            selfDefendingCode = `
+            code = `
                 var ${environmentName} = function(){return ${Utils.stringToUnicode('production')};};
                                                                       
                 if (
                     ${keyName} % ${Utils.getRandomInteger(this.unicodeArray.length / 8, this.unicodeArray.length / 2)} === 0 &&
                     /\\w+ *\\(\\) *{\\w+ *['|"].+['|"];? *}/.test(
                         ${environmentName}[${Utils.stringToUnicode('toString')}]()
-                    ) !== true && ${keyName}++
+                    ) === true || ${keyName}++
                 ) {
-                    return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]
+                    return ${this.unicodeArrayName}[parseInt(${keyName}, 16)];
                 }
+                
+                return ${this.unicodeArrayName}[parseInt(${keyName}, 16)];
             `;
+        } else {
+            code = `return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]`;
         }
 
         node = esprima.parse(`
             var ${this.unicodeArrayCallsWrapperName} = function (${keyName}) {
-                ${selfDefendingCode}
-                
-                return ${this.unicodeArrayName}[parseInt(${keyName}, 16)]
+                ${code}
             };
         `);
 
diff --git a/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.ts b/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.ts
index 50f599e9..ee53d996 100644
--- a/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.ts
+++ b/src/custom-nodes/unicode-array-nodes/UnicodeArrayDecodeNode.ts
@@ -76,11 +76,11 @@ export class UnicodeArrayDecodeNode extends Node {
             indexVariableName: string = Utils.getRandomVariableName(),
             tempArrayName: string = Utils.getRandomVariableName();
 
-        let node: INode,
-            selfDefendingCode: string = '';
+        let code: string = '',
+            node: INode;
 
         if (this.options['selfDefending']) {
-            selfDefendingCode = `
+            code = `
                 var ${environmentName} = function(){return ${Utils.stringToUnicode('dev')};};
                                         
                 if (
@@ -120,7 +120,7 @@ export class UnicodeArrayDecodeNode extends Node {
                 var ${tempArrayName} = [];
                 
                 for (var ${indexVariableName} in ${this.unicodeArrayName}) {
-                    ${selfDefendingCode}
+                    ${code}
                 
                     ${tempArrayName}[${Utils.stringToUnicode('push')}](decodeURI(atob(${this.unicodeArrayName}[${indexVariableName}])));
                 }