[BUGFIX] fix resolvement including multiple uids

Change-Id: I4d72b339996015a01d62db83da1e1c853962dfce