Make buffer parsing more robust

2 jobs for fix-buffer-parsing in 1 minute and 10 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #16683
test2.7

00:01:08

passed #16684
test3.6

00:01:10