diff --git agent/mibgroup/agent/extend.c agent/mibgroup/agent/extend.c
index 68a11e2..c5a1686 100644
--- agent/mibgroup/agent/extend.c
+++ agent/mibgroup/agent/extend.c
@@ -1310,6 +1310,21 @@ _extend_find_entry( netsnmp_request_info       *request,
                      */
                     line_idx = 1;
                     for (eptr = eptr->next ; eptr; eptr = eptr->next ) {
+
+		    	/*
+			 * fix incorrect extend call.
+			 *
+			 * With below snmpd.conf, if you call test_sh1 extend,
+			 * "/bin/echo echo2" is also excuted.
+			 *
+			 * [snmpd.conf]
+			 *    extend test_sh1         /bin/echo echo1
+			 *    extend test_sh2         /bin/echo echo2
+			 */
+		    	if( 0 != strcmp( eptr->token, token)){
+				continue;
+			}
+
                         if ((eptr->flags & NS_EXTEND_FLAGS_ACTIVE) &&
                             (netsnmp_cache_check_and_reload( eptr->cache ) >= 0 )) {
                             break;