initial bootstrap fix