Bootstrap craziness solved. Sorry if this commit break anything.