Check for uniqueness properly