Fixed dup key issue