small modification in EtsUnique