diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 7544143a1d..7b20dd73f5 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -545,10 +545,10 @@ class AttendanceController
             $changed = 1;
 
             for ($i= 0; $i <= $rows; $i++) {
-                $row = $data_table[$i];
+                $row = isset($data_table[$i]) ? $data_table[$i] : null;
                 $key = 1;
                 $max_dates_per_page = 10;
-                $item = $data_table[$i];
+                $item = isset($data_table[$i]) ? $data_table[$i] : null;
                 $count_j = 0;
 
                 if (!empty($item)) {
@@ -567,14 +567,13 @@ class AttendanceController
             }
 
             $content = null;
-
             if (!empty($tables)) {
                 foreach ($tables as $sub_table) {
                     $content .= Export::convert_array_to_html($sub_table).'<br /><br />';
                 }
             }
         } else {
-            $content .= Export::convert_array_to_html($data_table, array('header_attributes' =>   array('align' => 'center')));
+            $content = Export::convert_array_to_html($data_table, array('header_attributes' =>  array('align' => 'center')));
         }
 
         $params = array(
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index b7b77ca8d8..885919b737 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -112,7 +112,7 @@ if (api_is_allowed_to_edit(null, true) ||
         //if (count($users_in_course) > 0) {
             $form->display();
         //}
-        echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'">'.
+        echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'&group_id='.$groupId.'">'.
             Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }