Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 6188)
+++ trunk/src_plugins/puller/puller.c	(revision 6189)
@@ -2268,6 +2268,7 @@
 static int pcb_act_GlobalPuller(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	int select_flags = 0;
+	unsigned int cflg;
 
 	setbuf(stdout, 0);
 	nloops = 0;
@@ -2283,10 +2284,9 @@
 	/* This canonicalizes all the lines, and cleans up near-misses.  */
 	/* pcb_hid_actionl("djopt", "puller", 0); */
 
-	current_is_solder = (pcb_layer_get_group_(CURRENT)
-											 == pcb_layer_get_group(pcb_solder_silk_layer));
-	current_is_component = (pcb_layer_get_group_(CURRENT)
-													== pcb_layer_get_group(pcb_component_silk_layer));
+	cflg = pcb_layergrp_flags(pcb_layer_get_group_(CURRENT));
+	current_is_solder = (cflg & PCB_LYT_BOTTOM);
+	current_is_component = (cflg & PCB_LYT_TOP);
 
 	lines = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra);
 	arcs = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra);