diff --git a/src/apps/debugger/controllers/ThreadHandler.cpp b/src/apps/debugger/controllers/ThreadHandler.cpp
index 72e519b70b..ebc4247e9d 100644
--- a/src/apps/debugger/controllers/ThreadHandler.cpp
+++ b/src/apps/debugger/controllers/ThreadHandler.cpp
@@ -730,8 +730,8 @@ ThreadHandler::_HandleSingleStepStep(CpuState* cpuState)
 						TRACE_CONTROL("ThreadHandler::_HandleSingleStepStep() "
 							" - adding return value for STEP_OVER\n");
 						ReturnValueInfo* info = new(std::nothrow)
-							ReturnValueInfo(cpuState->InstructionPointer(),
-								cpuState);
+							ReturnValueInfo(fStepStatement
+								->CoveringAddressRange().Start(), cpuState);
 						if (info == NULL)
 							return false;
 						BReference<ReturnValueInfo> infoReference(info, true);