Merge pull request #1366 from sebras/fix-out-of-bounds-access