Fixe bootstrapping bug - #40