Fix bootstrap hanging