diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
index 38e733f..d0af0fc 100644
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -161,8 +161,11 @@ function template_preprocess_cod_session_calendar(&$vars) {
         $class = '';
       }
       foreach ($session->field_session_room as $room_instance) {
-        $session_grid[$session->field_session_slot[0]['nid']][$room_instance['nid']]['session'] = $session;
-        $session_grid[$session->field_session_slot[0]['nid']][$room_instance['nid']]['class'] = $class;
+        // If a session item spans multiple time slots, add an instance for each.
+        foreach($session->field_session_slot as $key => $value) {
+          $session_grid[$session->field_session_slot[$key]['nid']][$room_instance['nid']]['session'] = $session;
+          $session_grid[$session->field_session_slot[$key]['nid']][$room_instance['nid']]['class'] = $class;
+        }
       }
       // Create array of populated slots.
       if (!$show_all_slots && !in_array($session->field_session_slot[0]['nid'], $slot_nids)) {
@@ -296,4 +299,4 @@ function _cod_session_machine_keys($prefix, $keys) {
     $machine_keys[$index] = $machine_key;
   }
   return $machine_keys;
-}
\ No newline at end of file
+}