Another followup fix for breadcrumbs - RA-410