diff --git a/pykd/pycpucontext.h b/pykd/pycpucontext.h
index a6a6f14..0763d93 100644
--- a/pykd/pycpucontext.h
+++ b/pykd/pycpucontext.h
@@ -115,8 +115,7 @@ inline void setCurrentFrame( kdlib::StackFramePtr& stackFrame) {
 
 inline void setCurrentFrameByIndex( unsigned long frameIndex) {
     AutoRestorePyState  pystate;
-    kdlib::StackFramePtr  stackFrame = kdlib::getStack()->getFrame(frameIndex);
-    kdlib::setCurrentStackFrame(stackFrame);
+    kdlib::setCurrentStackFrameByIndex(frameIndex);
 }
 
 inline void resetCurrentFrame() {