Fix duplicate arrays

Change-Id: I9ac5260acf475e4291460c13c109b5618aefe8d6