diff --git a/FarmmapsApi/Services/GeneralService.cs b/FarmmapsApi/Services/GeneralService.cs
index 36e5452..a415c07 100644
--- a/FarmmapsApi/Services/GeneralService.cs
+++ b/FarmmapsApi/Services/GeneralService.cs
@@ -71,11 +71,12 @@ namespace FarmmapsApi.Services
 
         public async Task<Item> ShapeToGeotiff(Item shapeItem)
         {
+            var startUpload = DateTime.UtcNow.AddSeconds(-3);
             await RunAndWaitForTask(shapeItem, "vnd.farmmaps.task.shapetogeotiff");
 
-            // the parent of the shape item is now the tiff item
-            shapeItem = await _farmmapsApiService.GetItemAsync(shapeItem.Code);
-            return await _farmmapsApiService.GetItemAsync(shapeItem.ParentCode);
+            return await FindChildItemAsync(shapeItem.ParentCode, GEOTIFF_PROCESSED_ITEMTYPE, shapeItem.Name,
+                i => i.Created >= startUpload &&
+                     i.Name.ToLower().Contains(shapeItem.Name.ToLower()));
         }