diff --git a/bspc.c b/bspc.c
index c7826cb..061619b 100644
--- a/bspc.c
+++ b/bspc.c
@@ -319,8 +319,7 @@ int bspwm_update(struct module *module) {
 			break;
 		}
 		if(isdigit(module->buffer[i]) && *current == module->buffer[i]) {
-			/* XXX: susceptible to buffer overflow */
-			if(i == MODULE_BUFFER_LEN) module->buffer[i + 1] = '<';
+			if(i <= MODULE_BUFFER_LEN - 2) module->buffer[i + 1] = '<';
 			*current = '\0';
 		}
 		if(module->buffer[i] == '\n')