diff --git a/script/camtool.py b/script/camtool.py
index 7726651..f70ac0f 100644
--- a/script/camtool.py
+++ b/script/camtool.py
@@ -44,8 +44,11 @@ class CamTool(DeviceBase):
         self.cam_run = Channel(prefix + "camera.run", alias = name + " run")
         self.cam_latch = Channel(prefix + "latch.capture", 'l', alias = name + " latch")        
         if self.mode == "latch":
+            self.start()
             self.cam_latch.write(1)       
             self.waitForChannel(self.data_prefix + "timestamp",20)
+        else:
+            self.stop()
         self.timestamp = Channel(self.data_prefix + "timestamp", alias = name + " timestamp") #[D1, D2, ...]        
         self.com_x = Channel(self.data_prefix + "x_stats.com", alias = name + " com x")
         self.com_y = Channel(self.data_prefix + "y_stats.com", alias = name + " com y")