diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy
index 0b5e7ec..b8e9756 100644
--- a/src/com/mirantis/mk/Common.groovy
+++ b/src/com/mirantis/mk/Common.groovy
@@ -379,15 +379,8 @@
  */
 
 def checkContains(variable, keyword) {
-    if (binding.variables.containsKey(variable)) {
-        v = binding.variables[variable]
-
-        if (v instanceof String && keyword instanceof String) {
-            return v.toLowerCase().contains(keyword.toLowerCase())
-        } else {
-            return false
-        }
-
+    if(env.getEnvironment().containsKey(variable)){
+        return env[variable] && env[variable].toLowerCase().contains(keyword.toLowerCase())
     } else {
         return false
     }