Fix Bug 938870, last part of the fix for the breadcrumbs

@erikrose r?