Fixing bugs for resubmit records.