diff --git a/appl/popper/pop_init.c b/appl/popper/pop_init.c
index 6f43e2801..e3c3d1ebb 100644
--- a/appl/popper/pop_init.c
+++ b/appl/popper/pop_init.c
@@ -212,8 +212,8 @@ pop_init(POP *p,int argcount,char **argmessage)
     if(version_flag)
 	krb5_errx(p->context, 0, "%s", heimdal_version);
 
-    argc -= optind;
-    argv += optind;
+    argcount -= optind;
+    argmessage += optind;
 
     if (argc != 0) {
 	arg_printusage(args, num_args, "");