Fixed unique id related issue

Change-Id: I4cc030f9c7a84400aa058b54d274c17417ee14aa
Merge pull request #32 from Juniper/master

Fixed unique id related issue