resolving identification_not_unique issue.

trello: https://trello.com/c/QFD7UrIF/583-fix-identification-not-unique