Fix bootstrap locator

All is in the diff