diff --git a/lib/limits.c b/lib/limits.c
index fa751104e1..04dc2d86c7 100644
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -467,7 +467,7 @@ void setup_limits (const struct passwd *info)
 		for (cp = info->pw_gecos; cp != NULL; cp = strchr (cp, ',')) {
 			char  *val;
 
-			cp = strprefix(cp, ",") ?: cp;
+			cp = stpspn(cp, ",");
 
 			val = strprefix(cp, "pri=");
 			if (val != NULL) {