Fix lack of uniqueness