diff --git a/PrefabLightmapData.cs b/PrefabLightmapData.cs
index beac0b2..ea3d681 100644
--- a/PrefabLightmapData.cs
+++ b/PrefabLightmapData.cs
@@ -170,14 +170,16 @@ void ApplyRendererInfo(RendererInfo[] infos, int[] lightmapOffsetIndex, LightInf
     [UnityEditor.MenuItem("Assets/Bake Prefab Lightmaps")]
     static void GenerateLightmapInfo()
     {
-        if (UnityEditor.Lightmapping.giWorkflowMode != UnityEditor.Lightmapping.GIWorkflowMode.OnDemand)
+        Lightmapping.BakeOnSceneLoadMode mode = Lightmapping.bakeOnSceneLoad;
+
+        if (mode == Lightmapping.BakeOnSceneLoadMode.IfMissingLightingData)
         {
             Debug.LogError("ExtractLightmapData requires that you have baked you lightmaps and Auto mode is disabled.");
             return;
         }
         UnityEditor.Lightmapping.Bake();
 
-        PrefabLightmapData[] prefabs = FindObjectsOfType<PrefabLightmapData>();
+        PrefabLightmapData[] prefabs = FindObjectsByType<PrefabLightmapData>(FindObjectsSortMode.InstanceID);
 
         foreach (var instance in prefabs)
         {