Correct handling of unique fields