diff --git a/calendar/lib.php b/calendar/lib.php
index bda9e211ff6..684729f4d12 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1198,11 +1198,12 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
                 else if(isset($USER->groupmember[$courseid])) {
                     //changed to 2D array
                     foreach ($USER->groupmember[$courseid] as $groupid){
-                        $grouparray[] = $groupid;
+                        $rec = get_record('groups_courses_groups', 'courseid', $courseid, 'groupid', $groupid);
+                        //$grouparray[] = $groupid;
+                        $grouparray[] = $rec->id;
                     }
                 }
             }
-            
             if (!empty($groupids)) {
                 $sql = "SELECT id, groupid 
                         FROM {$CFG->prefix}groups_courses_groups
diff --git a/group/lib/basicgrouplib.php b/group/lib/basicgrouplib.php
index 179271a6db0..29a7443abd9 100644
--- a/group/lib/basicgrouplib.php
+++ b/group/lib/basicgrouplib.php
@@ -94,7 +94,7 @@ function groups_get_all_groups_for_user($userid) {
     // Put the results into an array. TODO: check.
     $groupids = array();
     foreach ($groups as $group) {
-        array_push($groupids, $group->id);    
+        array_push($groupids, $group->groupid);    
     }
     return $groupids;
 }