Fix #4: Prevent duplicate fields in records