diff --git a/LinearSnapControl.py b/LinearSnapControl.py
index 3ff9388..c6e5872 100644
--- a/LinearSnapControl.py
+++ b/LinearSnapControl.py
@@ -139,12 +139,14 @@ def findFocus(self, camera=None):
 		
 	def triggerHalt(self):
 		self.halt = True
+		self.toggleLight(False)
 		while(self.arduino.in_waiting):
 			t = self.arduino.read()
 
 	def endOfCore(self, message):
 		self.halt = True
 		time.sleep(0.1)
+		self.toggleLight(False)
 		# self.goHome()
 
 	def imageCore(self, coreId, callback, camera, coreSize):
@@ -229,5 +231,5 @@ def imageCore(self, coreId, callback, camera, coreSize):
 				t.start()
 				if(self.halt):
 					return
-		self.toggleLight(False)
+		
 		self.callback()