diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp
index ee768aab4..4fa2fc3d3 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficLightGroup.cpp
@@ -35,9 +35,12 @@ void ATrafficLightGroup::ResetGroup()
     Controller->ResetState();
   }
   CurrentController = 0;
-  if(Controllers.Num() > 0) {
+  if(Controllers.Num() > 0)
+  {
     Timer = Controllers[CurrentController]->NextState();
-  } else {
+  }
+  else
+  {
     Timer = 0.0f;
   }
   CurrentStateTimer = Timer;
@@ -94,6 +97,7 @@ void ATrafficLightGroup::NextCycleStep()
   else
   {
     Timer = controller->NextState();
+    CurrentStateTimer = Timer;
   }
 }