Updating to only set ID if it's an int field