[COMMIT] Fix get-other-frame bug