Crumbs bugfix