fix duplicates

Change-Id: I7a512865a523159688d38ae19f286a6a9fe48187