diff --git a/psychopy/experiment/components/_base.py b/psychopy/experiment/components/_base.py
index 2061fa4e3b..d2c81fba9c 100644
--- a/psychopy/experiment/components/_base.py
+++ b/psychopy/experiment/components/_base.py
@@ -158,18 +158,24 @@ def writeRoutineEndCode(self, buff):
             else:
                 currLoop = self.exp._expHandler
 
+            if 'Stair' in currLoop.type:
+                addDataFunc = 'addOtherData'
+            else:
+                addDataFunc = 'addData'
+
             if self.params['syncScreenRefresh'].val:
                 code = (
-                    "{loop}.addData('{name}.started', {name}.tStartRefresh)\n"
-                    "{loop}.addData('{name}.stopped', {name}.tStopRefresh)\n"
+                    "{loop}.{addDataFunc}('{name}.started', {name}.tStartRefresh)\n"
+                    "{loop}.{addDataFunc}('{name}.stopped', {name}.tStopRefresh)\n"
                 )
             else:
                 code = (
-                    "{loop}.addData('{name}.started', {name}.tStart)\n"
-                    "{loop}.addData('{name}.stopped', {name}.tStop)\n"
+                    "{loop}.{addDataFunc}('{name}.started', {name}.tStart)\n"
+                    "{loop}.{addDataFunc}('{name}.stopped', {name}.tStop)\n"
                 )
             buff.writeIndentedLines(code.format(loop=currLoop.params['name'],
-                                                name=self.params['name']))
+                                                name=self.params['name'],
+                                                addDataFunc=addDataFunc))
 
     def writeRoutineEndCodeJS(self, buff):
         """Write the code that will be called at the end of