diff --git a/dist/flatland_rl-3.0.3-py2.py3-none-any.whl b/dist/flatland_rl-3.0.4-py2.py3-none-any.whl
similarity index 98%
rename from dist/flatland_rl-3.0.3-py2.py3-none-any.whl
rename to dist/flatland_rl-3.0.4-py2.py3-none-any.whl
index 6a020d6756287458a07c679ff06c40f960f72cd3..3ec2981807b61b3c4071219acd0a65bd32062129 100644
Binary files a/dist/flatland_rl-3.0.3-py2.py3-none-any.whl and b/dist/flatland_rl-3.0.4-py2.py3-none-any.whl differ
diff --git a/flatland/__init__.py b/flatland/__init__.py
index 3d7c8777df73f984ac08dea3c0522865aec87092..5b9795329f535e285a26b3c6aa7e3d0781913ae3 100644
--- a/flatland/__init__.py
+++ b/flatland/__init__.py
@@ -4,4 +4,4 @@
 
 __author__ = """S.P. Mohanty"""
 __email__ = 'mohanty@aicrowd.com'
-__version__ = '3.0.3'
+__version__ = '3.0.4'
diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py
index 437978833627874f79e2f42107c4f91c065ff413..16f24ad6e77392c664bd214b11099e05d0702459 100644
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -492,7 +492,7 @@ class RailEnv(Environment):
 
     def handle_done_state(self, agent):
         """ Any updates to agent to be made in Done state """
-        if agent.state == TrainState.DONE:
+        if agent.state == TrainState.DONE and agent.arrival_time is None:
             agent.arrival_time = self._elapsed_steps
             if self.remove_agents_at_target:
                 agent.position = None
@@ -764,4 +764,4 @@ class RailEnv(Environment):
                     self.renderer.close_window()
             except Exception as e:
                 print("Could Not close window due to:",e)
-            self.renderer = None
\ No newline at end of file
+            self.renderer = None
diff --git a/setup.cfg b/setup.cfg
index 784da7c226a7833f70c4d57cf179a78769f5785e..1d6fe300baff03b9f014d9a5892f852909143fbb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.3
+current_version = 3.0.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 4ee6f6cb1ea3ffcfc556187a74b55bf7f0c41435..c525d8d0fecf2915237817b736d6e5bb039e3b68 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://gitlab.aicrowd.com/flatland/flatland',
-    version='3.0.3',
+    version='3.0.4',
     zip_safe=False,
 )