diff --git a/includes/uuid_fpp.features.inc b/includes/uuid_fpp.features.inc
index 1d3574b..f824a9b 100644
--- a/includes/uuid_fpp.features.inc
+++ b/includes/uuid_fpp.features.inc
@@ -163,26 +163,23 @@ function uuid_fpp_features_rebuild($module) {
  * Same process as module_invoke_all().
  */
 function _uuid_fp_features_provides_bundle() {
+
   $implements = array();
-  $data = array();
+  $entity_info = fieldable_panels_panes_entity_info();
 
   // Discover all modules which implement entity_info_alter
-  $hook = 'entity_info_alter';
-  foreach (module_implements($hook) as $module) {
-    $function = $module . '_' . $hook;
+  foreach (module_implements('entity_info_alter') as $module) {
+    $function = $module . '_entity_info_alter';
     if (function_exists($function)) {
 
       // Essentially we need to invoke the hook_alter() and see if our target
       // entity had some values added.
-      $function($data);
+      $function($entity_info);
 
       // If we have a key for our entity, log the module.
-      if (isset($data['fieldable_panels_pane'])) {
+      if (isset($entity_info['fieldable_panels_pane'])) {
         $implements[] = $module;
       }
-
-      // Always reset the altered array, otherwise we'd probably end up with a loop.
-      $data = array();
     }
   }
   return $implements;