major bootstrap fix