Merge branch 'fix-buffer-overflow'