Make buffer parsing more robust

2 jobs for fix-buffer-parsing in 1 minute and 10 seconds (queued for 1 second)