diff --git a/focus.c b/focus.c
index d29d6c323..5c6e926f9 100644
--- a/focus.c
+++ b/focus.c
@@ -99,9 +99,10 @@ static Client *
 focus_get_latest_client_for_tags(Tag **t)
 {
     FocusList *fl;
+    Tag **tags;
 
     for(fl = globalconf.focus; fl; fl = fl->prev)
-        for(; *t; t++)
+        for(tags = t; *tags; tags++)
             if(is_client_tagged(fl->client, *t))
                 return fl->client;
 
diff --git a/tag.c b/tag.c
index d515530d2..9ebc87ab8 100644
--- a/tag.c
+++ b/tag.c
@@ -91,6 +91,7 @@ is_client_tagged(Client *c, Tag *t)
     for(tc = globalconf.tclink; tc; tc = tc->next)
         if(tc->client == c && tc->tag == t)
             return True;
+
     return False;
 }