diff --git a/FarmmapsApi/Services/GeneralService.cs b/FarmmapsApi/Services/GeneralService.cs
index d0ce9eb..1d27baa 100644
--- a/FarmmapsApi/Services/GeneralService.cs
+++ b/FarmmapsApi/Services/GeneralService.cs
@@ -59,13 +59,12 @@ namespace FarmmapsApi.Services
                 {
                     List<Item> items = await _farmmapsApiService.GetItemChildrenAsync(zipItem.Code,
                         SHAPE_PROCESSED_ITEMTYPE);
+
+                    items = items.Where(i => i.Created >= startUpload).OrderByDescending(i => i.Created).ToList();
                     
-                    if (items.Count(i => i.Created >= startUpload) > 0)
+                    if (items.Any())
                     {
-                        shapeItem = items.Where(i => i.Name.Contains(itemName))
-                            .OrderByDescending(i => i.Created)
-                            .First();
-                        
+                        shapeItem = items.First(i => i.Name.Contains(itemName));
                         if(shapeItem != null)
                         {
                             source.Cancel();