fix to record data issues