diff --git a/src/tag.c b/src/tag.c
index ce2f660..46ca92a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -118,7 +118,7 @@ uicb_tag_set(Uicb cmd)
      struct tag *t;
 
      TAILQ_FOREACH(t, &W->screen->tags, next)
-          if(++i == n && t != W->screen->seltag)
+          if(i++ == n && t != W->screen->seltag)
           {
                tag_screen(W->screen, t);
                return;
diff --git a/wmfsrc2 b/wmfsrc2
index c0eef79..2d9ae2a 100644
--- a/wmfsrc2
+++ b/wmfsrc2
@@ -123,9 +123,9 @@
   [key] mod = {"Control","Alt"} key = "q" func = "quit" [/key]
   [key] mod = {"Control", "Alt"} key = "r" func = "reload" [/key]
 
-  [key] mod = {"Super"} key = "1" func = "tag_set" cmd = "1" [/key]
-  [key] mod = {"Super"} key = "2" func = "tag_set" cmd = "2" [/key]
-  [key] mod = {"Super"} key = "3" func = "tag_set" cmd = "3" [/key]
+  [key] mod = {"Super"} key = "1" func = "tag_set" cmd = "0" [/key]
+  [key] mod = {"Super"} key = "2" func = "tag_set" cmd = "1" [/key]
+  [key] mod = {"Super"} key = "3" func = "tag_set" cmd = "2" [/key]
   [key] mod = {"Super"} key = "s" func = "tag_next" [/key]
   [key] mod = {"Super"} key = "a" func = "tag_prev" [/key]
   [key] mod = {"Super"} key = "z" func = "tag" cmd = "tag2" [/key]