Added check to avoid repeated fields