Merge "Fix invalid character access"