Fix douplicates

Change-Id: Ice7e267549504d07b2df81fe5a0ca3ecb180b150