diff --git a/config.mk b/config.mk
index aa90094..de2fb00 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.1
+VERSION = 4.2
 
 # Customize below to fit your system
 
diff --git a/layout.c b/layout.c
index bc5ca1c..47e9e49 100644
--- a/layout.c
+++ b/layout.c
@@ -198,11 +198,9 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-		if(i == nlayouts - 1)
-			lt = &layout[0];
-		else
-			lt = &layout[++i];
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
 	}
 	else {
 		i = atoi(arg);