fixed doublicate key issue