Final bootstrap fix