Use buffer to fix flaky tunnel creation recognition