diff --git a/token.tokens.inc b/token.tokens.inc
index 13df37f..dfd3fe4 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -1371,6 +1371,9 @@ function field_tokens($type, $tokens, array $data = array(), array $options = ar
     // The field API does weird stuff to the entity, so let's clone it.
     $entity = clone $data['entity'];
 
+    // Now, to make sure that fields hidden by the current display are properly processed, reset prepared flags on entity
+    $entity->_field_view_prepared = FALSE;
+	
     list(, , $bundle) = entity_extract_ids($entity_type, $entity);
     $fields = field_info_instances($entity_type, $bundle);