verificatio of existing UID fixed
merged