diff --git a/includes/date.inc b/includes/date.inc
index 7b190d0..36ecf04 100644
--- a/includes/date.inc
+++ b/includes/date.inc
@@ -81,7 +81,7 @@ function signup_content_type_fields() {
  */
 function _signup_date_get_node_scheduler($node) {
   $field = signup_date_field($node->type);
-  if (!empty($node->{$field['field_name']}[$node->language][0]['value'])) {
+  if (!empty(field_get_items('node', $node, $field['field_name']))) {
     return 'date';
   }
   if (isset($node->{$field['field_name'] . '_value'})) {
@@ -453,17 +453,17 @@ function _signup_date_node_completed($node) {
   $field = signup_date_field($node->type);
   if ($field && $field != 'none' && isset($node->{$field['field_name']})) {
     // Grab whatever date value we actually have, regardless of format.
-    $date_value = $node->{$field['field_name']}[$node->language][0]['value'];
+    $date_values = field_get_items('node', $node, $field['field_name']);
     // Figure out the timezone handling for this date.
     if ($field['settings']['tz_handling'] == 'date') {
-      $tz = $node->{$field['field_name']}[$node->language][0]['timezone'];
+      $tz = $date_values[0]['timezone'];
     }
     else {
       $tz = date_default_timezone();
     }
     $db_tz = date_get_timezone_db($field['settings']['tz_handling'], $tz);
     // Create a date object
-    $date = new DateObject($date_value, $db_tz, NULL);
+    $date = new DateObject($date_values[0]['value'], $db_tz, NULL);
     // Make sure the date object is going to print UTC values.
     $date->setTimezone(timezone_open('UTC'));
     // Find out how early signups should be automatically closed.
@@ -487,7 +487,8 @@ function _signup_date_format_date($node, $include_to_date = FALSE) {
   }
   if ($field['settings']['tz_handling'] == 'date') {
     if (isset($node->{$field['field_name']})) {
-      $tz = $node->{$field['field_name']}[$node->language][0]['timezone'];
+      $date_values = field_get_items('node', $node, $field['field_name']);
+      $tz = $date_values[0]['timezone'];
     }
     else {
       $tz = $node->{$field['field_name'] . '_timezone'};
@@ -500,7 +501,7 @@ function _signup_date_format_date($node, $include_to_date = FALSE) {
   $db_tz = date_get_timezone_db($field['settings']['tz_handling'], $tz);
 
   if (isset($node->{$field['field_name']})) {
-    $date_value = $node->{$field['field_name']}[$node->language][0]['value'];
+    $date_value = $date_values[0]['value'];
   }
   else {
     $date_value = $node->{$field['field_name'] . '_value'};
@@ -515,7 +516,7 @@ function _signup_date_format_date($node, $include_to_date = FALSE) {
 
   if ($include_to_date) {
     if (isset($node->{$field['field_name']})) {
-      $date_value = $node->{$field['field_name']}[$node->language][0]['value2'];
+      $date_value = $date_values[0]['value2'];
     }
     else {
       $date_value = $node->{$field['field_name'] . '_value2'};