diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b37a6af..b498bd03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 
 # CHANGELOG
 
+*1.2.12* (2018-10-22)
+  - Quick menu-related fixes (#122)
+
 *1.2.11* (2018-10-16)
   - Fix infoscience search warnings (#116)
   - Allow to set multiple columns on people render (#110)
diff --git a/VERSION b/VERSION
index c1147005..f2ae0b4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.11
+1.2.12
diff --git a/menus/submenu.php b/menus/submenu.php
index 3ad99598..971755d9 100644
--- a/menus/submenu.php
+++ b/menus/submenu.php
@@ -1,5 +1,5 @@
 <?php
-add_filter( 'wp_nav_menu_objects', 'submenu_limit', 10, 2 );
+add_filter( 'wp_nav_menu_objects', 'submenu_limit', 30, 2 );
 
 /**
  * function submenu_limit
diff --git a/style.css b/style.css
index 0a9016e8..c3cb5345 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.2.11
+Version: 1.2.12
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl
diff --git a/template-parts/breadcrumb.php b/template-parts/breadcrumb.php
index 1aeff4ac..c630a781 100644
--- a/template-parts/breadcrumb.php
+++ b/template-parts/breadcrumb.php
@@ -28,7 +28,10 @@
   <!-- Breadcrumb -->
   <?php
     // Breadcrumb
-    $items = wp_get_nav_menu_items(get_current_menu_slug());
+    $items = array();
+    foreach (wp_get_nav_menu_items(get_current_menu_slug()) as $item) {
+        $items[(int) $item->db_id] = $item;
+    }
 
     $item = $items ? reset(wp_filter_object_list( $items, ['object_id' => $post->ID])) : false;
 
@@ -42,21 +45,27 @@
             </a>
         </li>';
 
-    if ($items) {
-      _wp_menu_item_classes_by_context( $items ); // Set up the class variables, including current-classes
-      foreach($items as $item) {
-          if ($item->current_item_ancestor) {
+    $crumb_items = array();
+    for($crumb_item = $item;
+        $crumb_item;
+        $crumb_item = $items[(int) $crumb_item->menu_item_parent])
+    {
+        array_unshift($crumb_items, $crumb_item);
+    }
+    if ($crumb_items) {
+      foreach($crumb_items as $crumb_item) {
+          if ((int) $item->db_id === (int) $crumb_item->db_id) {
+            $crumbs[] = "
+                  <li class=\"breadcrumb-item active\">
+                      {$item->title}
+                  </li>";
+          } else {
               $crumbs[] = "
                   <li class=\"breadcrumb-item\">
                       <a class=\"bread-link bread-home\" href=\"{$item->url}\" title=\"{$item->title}\">
-                          {$item->title}
+                          {$crumb_item->title}
                       </a>
                   </li>";
-          } else if ($item->current) {
-            $crumbs[] = "
-                  <li class=\"breadcrumb-item active\">
-                      {$item->title}
-                  </li>";
           }
       }
     }