Merge pull request #268 from TheBlueMatt/2015-12-fuzz-fix-output-idx