Use buffer to fix flaky tunnel creation recognition

Fix for issue #15