diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c0a8607a874c3235196c0d6865d582132193ed22..d91bc8c89214cf50c5e1f9acfa38860906ae069d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -33,6 +33,7 @@ If you have an existing calendar you can add the menu tabs and turn on the date
 
 BUGFIXES:
 
+- Issue #1397986, Fix Undefined index groupby_times.
 - Issue #1466698 by alex.neblett and johnv, Make sure that all available fields appear on the template, even when shared across entity types.
 - The group by field option was not working right, fix it.
 - The calendar legend block was appearing even if empty. Create the content earlier to keep that from happening.
diff --git a/theme/theme.inc b/theme/theme.inc
index ac7128b7b9ff7083d0c5c20e48690948714a27ae..5d092205f58754ba6f7a5367f12ce393ffd85a0e 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -264,11 +264,11 @@ function template_preprocess_calendar_day(&$vars) {
     foreach ($grouped_items[$start_time]['values'] as $column => &$items) {
       foreach ($items as $index => &$item) {
         if ($display_overlap) {
-          if ($view->style_options['groupby_times'] == 'half'){
+          if ($view->date_info->style_groupby_times == 'half'){
             $group_time = 30;
             $divisor = 7.5;
           }
-          else if ($view->style_options['groupby_times'] == 'hour'){
+          else if ($view->date_info->style_groupby_times == 'hour'){
             $group_time = 60;
             $divisor = 15;
           } else {
@@ -473,11 +473,11 @@ function template_preprocess_calendar_week(&$vars) {
       foreach ($grouped_items[$start_time]['values'] as $wday => &$items) {
         foreach ($items as &$item) {
           if ($display_overlap) {
-            if ($view->style_options['groupby_times'] == 'half'){
+            if ($view->date_info->style_groupby_times == 'half'){
               $group_time = 30;
               $divisor = 7.5;
             }
-            else if ($view->style_options['groupby_times'] == 'hour'){
+            else if ($view->date_info->style_groupby_times == 'hour'){
               $group_time = 60;
               $divisor = 15;
             } else {