Fix issue with cluster bootstrap