diff --git a/storage/itemgroup.lua b/storage/itemgroup.lua
index 5715adb..448c4bd 100644
--- a/storage/itemgroup.lua
+++ b/storage/itemgroup.lua
@@ -141,20 +141,20 @@ function ItemGroup:transferTo(target, itemCount)
   local transferMax = math.min(itemCount or targetCap, targetCap, self:getItemCount())
   local transfer = 0
   for _,stack in targetGroup:_iterateStacks() do
-    if transfer >= transferMax then
-      break
-    end
-
-    local targetCount = math.min(stack:getCount() + transferMax - transfer, stack:getMaxCount())
     for _,from in self:_iterateStacks() do
-      if stack:getCount() == targetCount then
+      if transfer >= transferMax then
+        goto complete
+      end
+
+      if stack:getCount() == stack:getMaxCount() then
         goto continue
       end
-      local _, xfer = from:transferTo(stack, targetCount - stack:getCount())
+      local _, xfer = from:transferTo(stack, math.min(stack:getMaxCount() - stack:getCount(), transferMax - transfer))
       transfer = transfer + xfer
     end
       ::continue::
   end
+    ::complete::
 
   return itemCount == nil or (itemCount == transfer), transfer
 end