diff --git a/python/paddle/distributed/launch/context/__init__.py b/python/paddle/distributed/launch/context/__init__.py
index f93b30b4dd1329678c8e1d8d130fe2607f44461a..3e8f0de3e69d5539293b7514539acd155f758099 100644
--- a/python/paddle/distributed/launch/context/__init__.py
+++ b/python/paddle/distributed/launch/context/__init__.py
@@ -101,7 +101,6 @@ class Context(object):
             return False
 
     def set_env_in_args(self):
-        # this logic may not propre to replace args with env, but ...
         for k, v in env_args_mapping.items():
             if k in self.envs:
-                setattr(self.args, v, type(getattr(self.args, v))(self.envs[k]))
+                setattr(self.args, v, self.envs[k])
diff --git a/python/paddle/distributed/launch/controllers/collective.py b/python/paddle/distributed/launch/controllers/collective.py
index 6b4972c003cae421331b85a5fd898ff82200fc5a..1595bcd1efb66dea771dc0b699c9c0d02cc77aa6 100644
--- a/python/paddle/distributed/launch/controllers/collective.py
+++ b/python/paddle/distributed/launch/controllers/collective.py
@@ -131,7 +131,8 @@ class CollectiveElasticController(CollectiveController):
 
     def run(self):
 
-        timeout = self.ctx.args.elastic_timeout if self.job.elastic else self.ctx.args.elastic_timeout * 10
+        timeout = int(self.ctx.args.elastic_timeout)
+        timeout = timeout if self.job.elastic else timeout * 10
         self.register()
 
         while self.pod.restart <= self.ctx.args.max_restart:
diff --git a/python/paddle/distributed/launch/plugins/__init__.py b/python/paddle/distributed/launch/plugins/__init__.py
index 4c414a177d11ecd49162025838d63fa8933a1bde..a3a9e8c809a1c0f82f0c59374e62f33d38937333 100644
--- a/python/paddle/distributed/launch/plugins/__init__.py
+++ b/python/paddle/distributed/launch/plugins/__init__.py
@@ -62,7 +62,7 @@ def rewrite_host_ip(ctx):
 
 
 def test_mode(ctx):
-    if ctx.args.training_script == 'test':
+    if ctx.args.training_script == 'run_check':
         ctx.logger.info('Paddle Distributed Test begin...')
         if int(ctx.args.nnodes) < 2:
             ctx.args.nnodes = 2