Avoid duplicate breadcrumbs in fix for #1039