fix bootstrap and init