fix: make bootstrap more robust (and slower 😢) (#1351)

fix: make bootstrap more robust (and slower 😢) (#1351) #1418