diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs
index 4108bf817..206d2ce99 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs
@@ -14,7 +14,7 @@ namespace Orchard.Indexing.Handlers {
             _indexingTaskManager = indexingTaskManager;
 
             OnCreated<ContentPart>(CreateIndexingTask);
-            OnVersioned<ContentPart>(CreateIndexingTask);
+            OnUpdated<ContentPart>(CreateIndexingTask);
             OnPublished<ContentPart>(CreateIndexingTask);
             OnUnpublished<ContentPart>(CreateIndexingTask);
             OnRemoved<ContentPart>(RemoveIndexingTask);
@@ -24,8 +24,8 @@ namespace Orchard.Indexing.Handlers {
             _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem);
         }
 
-        void CreateIndexingTask(VersionContentContext context, ContentPart part1, ContentPart part2) {
-            _indexingTaskManager.CreateUpdateIndexTask(context.BuildingContentItem);
+        void CreateIndexingTask(UpdateContentContext context, ContentPart part) {
+            _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem);
         }
 
         void CreateIndexingTask(PublishContentContext context, ContentPart part) {
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
index 898c63822..c02dc55bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
@@ -206,7 +206,7 @@ namespace Orchard.Indexing.Services {
                     .Take(ContentItemsPerLoop)
                     .ToList()
                     .GroupBy(x => x.ContentItemRecord.Id)
-                    .Select(group => new {TaskId = group.Max(task => task.Id), Delete = group.Last().Action == IndexingTaskRecord.Delete, Id = group.Key, ContentItem = _contentManager.Get(group.Key, VersionOptions.Published)})
+                    .Select(group => new { TaskId = group.Max(task => task.Id), Delete = group.Last().Action == IndexingTaskRecord.Delete, Id = group.Key, ContentItem = _contentManager.Get(group.Key, VersionOptions.Latest) })
                     .OrderBy(x => x.TaskId)
                     .ToArray();