Bug fix for breadcrumbs bug [42300321]