diff --git a/DebugLibrary/steplistener.py b/DebugLibrary/steplistener.py
index 3d80fcf..65cdea1 100644
--- a/DebugLibrary/steplistener.py
+++ b/DebugLibrary/steplistener.py
@@ -43,13 +43,19 @@ def _start_keyword(self, name, attrs):
         self.debug()
 
 
+# Hack to find the current runner Step to get the source path and line number.
+# This method relies on the internal implementation logic of RF and may need
+# to be modified when there are major changes to RF.
 def find_runner_step():
     stack = inspect.stack()
     for frame in stack:
-        if frame.function == 'run_steps':
+        if (frame.function == 'run_steps'  # RobotFramework < 4.0
+                or frame.function == 'run'):  # RobotFramework >= 4.0
             arginfo = inspect.getargvalues(frame.frame)
             context.current_runner = arginfo.locals.get('runner')
             context.current_runner_step = arginfo.locals.get('step')
+            if context.current_runner_step:
+                break
 
 
 def set_step_mode(on=True):