diff --git a/Target.py b/Target.py
index 9b772c7..7012fb0 100644
--- a/Target.py
+++ b/Target.py
@@ -5,9 +5,6 @@ import logging
 import time
 
 class Target(Observable):
-
-    lastActivation = 0
-
     def __init__(self, points, name):
         logging.info("Target " + name + " created")
         self._events = defaultdict(list)
diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 3dd54f8..eaf4c16 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -19,6 +19,12 @@ class EndBallEvent(Event):
         super().__init__("End Of Ball Event")
 
     def trigger(self, target):
+        if not self.gameState.isPlaying:
+            return
+
+        if not self.gameState.isStarted:
+            return
+
         super().trigger(target)
 
         TopFlipper().deactivate()
diff --git a/factories/EventFactory.py b/factories/EventFactory.py
index b9fdceb..4e69a0d 100644
--- a/factories/EventFactory.py
+++ b/factories/EventFactory.py
@@ -97,6 +97,7 @@ class EventFactory:
         event = StartBallEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets['Credit'])
         return event
+
     def createBottomLeftBankEvent(self):
         event = BottomLeftBankEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Left Bank"])