diff --git a/bin/mod/ent-check-env b/bin/mod/ent-check-env
index d7539d15..3ffd5da4 100755
--- a/bin/mod/ent-check-env
+++ b/bin/mod/ent-check-env
@@ -222,12 +222,14 @@ check-env.check-bundle-cli() {
   local FLAGS FORCE=false
   parse-version-flags FLAGS VER_ENTANDO_BUNDLE_CLI_DEF VER_ENTANDO_BUNDLE_CLI_REQ ENTANDO_BUNDLE_CLI_VERSION_OVERRIDE
   _str_contains "$FLAGS" ",f," && FORCE=true
-  
-  local SOURCE_BASED=false
+
+  _pp VER_ENTANDO_BUNDLE_CLI_REQ
   if [[ "$VER_ENTANDO_BUNDLE_CLI_REQ" == "v1.2.0" || "$VER_ENTANDO_BUNDLE_CLI_REQ" == *"v1.0"* ]]; then
-    _str_contains "$FLAGS" ",g," && SOURCE_BASED=true
+    local SOURCE_BASED=true
+    _str_contains "$FLAGS" ",r," && SOURCE_BASED=false
   else
-    _str_contains "$FLAGS" ",r," || SOURCE_BASED=true
+    local SOURCE_BASED=false
+    _str_contains "$FLAGS" ",g," && SOURCE_BASED=true
   fi
 
   if $SOURCE_BASED; then