Avoid extraneous array.
Merge branch 'fix-merge'