diff --git a/src/wmfs.c b/src/wmfs.c
index a029f80..f1cc565 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -206,11 +206,17 @@ scan(void)
                {
                     if(XGetWindowProperty(dpy, w[i], ATOM("_WMFS_TAG"), 0, 32,
                                           False, XA_CARDINAL, &rt, &rf, &ir, &il, &ret) == Success && ret)
+                    {
                          tag = *ret;
+                         XFree(ret);
+                    }
 
                     if(XGetWindowProperty(dpy, w[i], ATOM("_WMFS_SCREEN"), 0, 32,
                                           False, XA_CARDINAL, &rt, &rf, &ir, &il, &ret) == Success && ret)
+                    {
                          screen = *ret;
+                         XFree(ret);
+                    }
 
                     c = client_manage(w[i], &wa);
 
@@ -222,9 +228,6 @@ scan(void)
                     arrange(c->screen);
                }
 
-     if(ret)
-          XFree(ret);
-
      XFree(w);
      arrange(screen_get_sel());