Index: apps/plugins/wormlet.c
===================================================================
--- apps/plugins/wormlet.c	(revision 22638)
+++ apps/plugins/wormlet.c	(working copy)
@@ -836,16 +836,18 @@
            If one or more corners of the new food hit any existing
            argh or food a collision is detected.
         */
+
         collisionDetected =
             food_collision(x                , y                ) >= 0 ||
             food_collision(x                , y + food_size - 1) >= 0 ||
             food_collision(x + food_size - 1, y                ) >= 0 ||
-            food_collision(x + food_size - 1, y + food_size - 1) >= 0 ||
-            argh_collision(x                , y                ) >= 0 ||
-            argh_collision(x                , y + food_size - 1) >= 0 ||
-            argh_collision(x + food_size - 1, y                ) >= 0 ||
-            argh_collision(x + food_size - 1, y + food_size - 1) >= 0;
+            food_collision(x + food_size - 1, y + food_size - 1) >= 0;
 
+        for (i=0; i<argh_count && !collisionDetected; i++)
+            collisionDetected = 
+                (arghx[i]-x<food_size) && (x-arghx[i]<argh_size) && 
+                (arghy[i]-y<food_size) && (y-arghy[i]<argh_size);
+ 
         /* use coordinates for further testing */
         foodx[index] = x;
         foody[index] = y;
@@ -853,7 +855,7 @@
         /* now test wether we accidently hit the worm with food ;) */
         i = 0;
         for (i = 0; i < worm_count && !collisionDetected; i++) {
-            collisionDetected |= worm_food_collision(&worms[i], index);
+            collisionDetected = worm_food_collision(&worms[i], index);
         }
     }
     while (collisionDetected);