diff --git a/storage/itemgroup.lua b/storage/itemgroup.lua
index 0f48c76..5715adb 100644
--- a/storage/itemgroup.lua
+++ b/storage/itemgroup.lua
@@ -141,7 +141,7 @@ 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
+    if transfer >= transferMax then
       break
     end
 
@@ -150,7 +150,7 @@ function ItemGroup:transferTo(target, itemCount)
       if stack:getCount() == targetCount then
         goto continue
       end
-      local _, xfer = from:transferTo(stack)
+      local _, xfer = from:transferTo(stack, targetCount - stack:getCount())
       transfer = transfer + xfer
     end
       ::continue::