2 files changed, 3 insertions, 4 deletions

diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index b555417a..7e50c178 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -103,14 +103,13 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
                                 ea_tmp=extra_args;
                                 while(ea_tmp->next) {
                                         ea_tmp=ea_tmp->next;
-                                        ea_num++;
                                 }
                                 ea_tmp->next=ea1;
+                                while(ea1=ea1->next) ea_num++;
                         }
                         ea1=ea_tmp=NULL;
                 }
-                /* lather, rince, repeat */
-        }
+        } /* lather, rince, repeat */
 
         if(ea_num==*argc && extra_args==NULL){
                 /* No extra-opts */
diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts.c
index b9696dfb..6d6167eb 100644
--- a/lib/tests/test_opts.c
+++ b/lib/tests/test_opts.c
@@ -276,7 +276,7 @@ main (int argc, char **argv)
         argv_test=(char **)malloc(4*sizeof(char **));
         argv_test[0] = "check_tcp";
         argv_test[1] = "--extra-opts";
-        argv_test[2] = "--extra-opts=tcp_long_lines@plugins.ini";
+        argv_test[2] = "--extra-opts=tcp_long_lines";
         argv_test[3] = NULL;
         argc_test=3;
         argv_known=(char **)realloc(argv_known, 7*sizeof(char **));