Another fix in extraRecordData handling