merged bootstrap fix