final bootstrap fix