Fix bootstrap order