diff --git a/hippolyzer/lib/proxy/sessions.py b/hippolyzer/lib/proxy/sessions.py
index 663a42b..65ab025 100644
--- a/hippolyzer/lib/proxy/sessions.py
+++ b/hippolyzer/lib/proxy/sessions.py
@@ -201,6 +201,15 @@ class SessionManager:
             session.http_message_handler,
         )
         self.sessions.append(session)
+        # TODO: less crap way of tying a LEAP client to a session
+        while self.pending_leap_clients:
+            leap_client = self.pending_leap_clients.pop(-1)
+            # Client may have gone bad since it connected
+            if not leap_client.connected:
+                continue
+            logging.info("Assigned LEAP client to session")
+            session.leap_client = leap_client
+            break
         logging.info("Created %r" % session)
         return session
 
@@ -209,15 +218,6 @@ class SessionManager:
             if session.pending and session.id == session_id:
                 logging.info("Claimed %r" % session)
                 session.pending = False
-                # TODO: less crap way of tying a LEAP client to a session
-                while self.pending_leap_clients:
-                    leap_client = self.pending_leap_clients.pop(-1)
-                    # Client may have gone bad since it connected
-                    if not leap_client.connected:
-                        continue
-                    logging.info("Assigned LEAP client to session")
-                    session.leap_client = leap_client
-                    break
                 return session
         return None
 
diff --git a/tests/base/test_skeleton.py b/tests/base/test_skeleton.py
index 29e54b8..2b396ea 100644
--- a/tests/base/test_skeleton.py
+++ b/tests/base/test_skeleton.py
@@ -17,6 +17,7 @@ class TestSkeleton(unittest.TestCase):
 
     def test_get_joint_index(self):
         self.assertEqual(7, self.skeleton["mNeck"].index)
+        self.assertEqual(113, self.skeleton["mKneeLeft"].index)
 
     def test_get_joint_parent(self):
         self.assertEqual("mChest", self.skeleton["mNeck"].parent().name)