Merge "Fix possible array access issue"