Fixing Jeff's bootstrap