diff --git a/src/agent/common.ts b/src/agent/common.ts
index 84e650e..94fd15d 100644
--- a/src/agent/common.ts
+++ b/src/agent/common.ts
@@ -430,11 +430,14 @@ function createMaskFunction(jobEnvironment: agentifm.JobEnvironment): Replacemen
     var envMasks = jobEnvironment.mask || [];
     var maskHints = [];
     envMasks.forEach((maskHint: agentifm.MaskHint) => {
-        if ((maskHint.type === agentifm.MaskType.Variable || maskHint.type === agentifm.MaskType.Regex) && maskHint.value) {
+        if (maskHint.type === agentifm.MaskType.Variable && maskHint.value) {
             if (jobEnvironment.variables[maskHint.value]) {
                 maskHints.push(maskHint);
             }
         }
+        else if (maskHint.type === agentifm.MaskType.Regex && maskHint.value) {
+            maskHints.push(maskHint);
+        }
     });
 
     if (maskHints.length > 0) {