diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ecc0fcbfa6fb0ef65649ea55c3ab5d19c260d99..0d190a1c4482573e245d912ee0a99e003bcbdc8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,15 +41,15 @@ IF(BUILD_PYTHON_INTERFACE)
 ENDIF(BUILD_PYTHON_INTERFACE)
 
 IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
-  INSTALL(DIRECTORY robots/anymal_b_simple_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/hyq_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/solo_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/icub_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/talos_data DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/kinova_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/tiago_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/ur_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/romeo_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/hector_description DESTINATION share/${PROJECT_NAME})
-  INSTALL(DIRECTORY robots/double_pendulum_description DESTINATION share/${PROJECT_NAME})
+  INSTALL(DIRECTORY robots/anymal_b_simple_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/hyq_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/solo_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/icub_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/talos_data DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/kinova_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/tiago_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/ur_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/romeo_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/hector_description DESTINATION share/${PROJECT_NAME}/robots)
+  INSTALL(DIRECTORY robots/double_pendulum_description DESTINATION share/${PROJECT_NAME}/robots)
 ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
diff --git a/python/example_robot_data/robots_loader.py b/python/example_robot_data/robots_loader.py
index 2c525afdc0fa9757adb42ff1f29412129fd53d39..c2c8caac790be9e28dc23ce41370c07dfa4edc4c 100644
--- a/python/example_robot_data/robots_loader.py
+++ b/python/example_robot_data/robots_loader.py
@@ -7,7 +7,7 @@ from pinocchio.robot_wrapper import RobotWrapper
 
 
 def getModelPath(subpath, printmsg=False):
-    base = '../../../share/example-robot-data'
+    base = '../../../share/example-robot-data/robots'
     main_dir = dirname(dirname(dirname(__file__)))
     for path in [join(dirname(main_dir), 'robots'), join(main_dir, 'robots')
                  ] + [join(p, base.strip('/')) for p in sys.path]: