diff --git a/event_track_calendar_event/models/event_track.py b/event_track_calendar_event/models/event_track.py
index 80e33ff..28d7f5a 100644
--- a/event_track_calendar_event/models/event_track.py
+++ b/event_track_calendar_event/models/event_track.py
@@ -9,9 +9,9 @@ class EventTrack(models.Model):
     calendar_event = fields.Many2one('calendar.event', 'Calendar event')
 
 
-    def get_calendar_event_values(self):
-        self.ensure_one()
-
+    def get_calendar_event_partner_value(self):
+        """Compute list of partner ids for calendar event
+        """
         # compute list of attendees
         partner_ids = []        
 
@@ -21,14 +21,19 @@ class EventTrack(models.Model):
                 
         # add event registration attendees
         partner_ids.extend([registration.partner_id.id for registration in self.event_id.registration_ids if registration.partner_id])
-        
+
+        return partner_ids
+
+
+    def get_calendar_event_values(self):
+        self.ensure_one()        
 
         return {
             'start':self.date, 
             'duration':self.duration,
             'stop':self.date + timedelta(minutes=round((self.duration or 1.0) * 60)),
             'user_id':self.user_id.id, 
-            'partner_ids':[Command.set(partner_ids)], 
+            'partner_ids':[Command.set(self.get_calendar_event_partner_value())], 
             'name':self.event_id.name+' - '+self.name,            
         }
 
diff --git a/event_track_calendar_event_event_speaker/models/event_track.py b/event_track_calendar_event_event_speaker/models/event_track.py
index 4db9609..47c4926 100644
--- a/event_track_calendar_event_event_speaker/models/event_track.py
+++ b/event_track_calendar_event_event_speaker/models/event_track.py
@@ -5,14 +5,11 @@ from odoo import fields, models, api, Command
 class EventTrack(models.Model):
     _inherit = "event.track"    
 
-
-    def get_calendar_event_values(self):
-        self.ensure_one()
-
-        res = super(EventTrack, self).get_calendar_event_values()
-
-        # add speakers
-        res['partner_ids'].extend(self.event_id.speaker_ids.ids)
-
+    def get_calendar_event_partner_value(self):
+        """Add speaker ids to calendar event partners
+        """
+        res = super(EventTrack, self).get_calendar_event_partner_value()
+        res.extend(self.event_id.speaker_ids.ids)
         return res
 
+