Merge pull request #737 from pcercuei/always-use-code-buffer