diff --git a/lava-collector b/lava-collector
index 591b1ef..e97fe8f 100644
--- a/lava-collector
+++ b/lava-collector
@@ -17,25 +17,23 @@ local function isLavaBucket()
     return compareItemName("minecraft:lava_bucket")
 end
 
-local function findFirstEmptyBucket()
+local function findFirstItem(target)
     for i=1,16 do
-        if isEmptyBucket() then
-            print('Found an empty bucket in slot ' .. i)
+        turtle.select(i)
+        if compareItemName() then
+            print('Found an target item (' .. target .. ') in slot ' .. i)
             return i
         end
     end
     return nil
 end
 
+local function findFirstEmptyBucket()
+    findFirstItem("minecraft:bucket")
+end
+
 local function findFirstLavaBucket()
-    for i=1,16 do
-        turtle.select(i)
-        if isLavaBucket() then
-            print('Found a lava bucket in slot ' .. i)
-            return i
-        end
-    end
-    return nil
+    findFirstItem("minecraft:lava_bucket")
 end
 
 local function returnToBase()