Fix for bootstrap

Fix for bootstrap