diff --git a/patch/cfacts.c b/patch/cfacts.c
index 872c8e8..82ee560 100644
--- a/patch/cfacts.c
+++ b/patch/cfacts.c
@@ -26,7 +26,7 @@ getfacts(Monitor *m, float *mf, float *sf)
 	Client *c;
 
 	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
-		if (!m->nmaster || n < m->nmaster)
+		if (m->nmaster && n < m->nmaster)
 			mfacts += c->cfact;
 		else
 			sfacts += c->cfact;
diff --git a/patch/tile.c b/patch/tile.c
index c8f74c9..3f03483 100644
--- a/patch/tile.c
+++ b/patch/tile.c
@@ -17,14 +17,14 @@ tile(Monitor *m)
 
 	sx = mx = m->wx + ov;
 	sy = my = m->wy + oh;
-	sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
+	mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
+	sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
 	sw = mw = m->ww - 2*ov;
 
 	if (m->nmaster && n > m->nmaster) {
 		sw = (mw - iv) * (1 - m->mfact);
 		mw = (mw - iv) * m->mfact;
 		sx = mx + mw + iv;
-		sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
 	}
 
 	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
@@ -53,14 +53,14 @@ tile(Monitor *m)
 
 	sx = mx = m->wx + ov;
 	sy = my = m->wy + oh;
-	sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
+	mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
+	sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
 	sw = mw = m->ww - 2*ov;
 
 	if (m->nmaster && n > m->nmaster) {
 		sw = (mw - iv) * (1 - m->mfact);
 		mw = (mw - iv) * m->mfact;
 		sx = mx + mw + iv;
-		sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
 	}
 
 	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
@@ -134,4 +134,4 @@ tile(Monitor *m)
 			ty += HEIGHT(c);
 		}
 }
-#endif
\ No newline at end of file
+#endif