Fix cat buffer issues
Merge pull request #2 from DSMan195276/cat-buffer-fix

Fix cat buffer issues