Trying to fix duplicates on mobile

Change-Id: I31154ab9c515357e6dc367514b9be750fd7454d2