diff --git a/flag.info.inc b/flag.info.inc
index e36b304..6742961 100644
--- a/flag.info.inc
+++ b/flag.info.inc
@@ -96,13 +96,15 @@ function flag_entity_property_info_alter(&$info) {
       }
     }
 
-    // Timestamp when the entity was flagged.
-    $info[$flag->entity_type]['properties']['flag_' . $flag->name . '_timestamp'] = array(
-      'label' => t('@flag Flagged timestamp', array('@flag' => $flag->name)),
-      'description' => t('The date the entity was flagged with @flag.', array('@flag' => $flag->name)),
+    // Properties of all Flags.
+    $info[$flag->entity_type]['properties']['flag_' . $flag->name . '_flagged_timestamp'] = array(
+      'label' => t('Flagged @flag timestamp', array('@flag' => $flag->name)),
+      'description' => t('The date the entity was flagged @flag.', array('@flag' => $flag->name)),
       'type' => 'date',
       'getter callback' => 'flag_properties_get_flagged_timestamp',
       'computed' => TRUE,
+      'flag_name' => $flag->name,
+      'flag_entity_type' => $flag->entity_type,
     );
   }
 }
diff --git a/flag.module b/flag.module
index db30b2e..f1419de 100644
--- a/flag.module
+++ b/flag.module
@@ -2629,13 +2629,12 @@ function flag_properties_get_flagging_boolean($entity, array $options, $name, $e
 }
 
 /**
- * Getter callback that returns the flagging timestamp.
+ * Getter callback that returns the timestamp when an entity was flagged.
  */
 function flag_properties_get_flagged_timestamp($entity, array $options, $name, $entity_type, $property_info) {
   list($entity_id,) = entity_extract_ids($entity_type, $entity);
-
   $flagging_data = flag_get_user_flags($entity_type, $entity_id);
-  return $flagging_data[$property_info['timestamp']];
+  return $flagging_data[$property_info['flag_name']]->timestamp;
 }
 
 /**