Merge "Fix out of bounds access"