Fix to ensure breadcrumbs are being tracked correctly.