Another attempt to fix boot issue of bundles not starting