fix duplicates

Change-Id: Ia93e52dedfce7ab1c563342664b410b66f2a7dbd