FIX: extrafields were not cloned