diff --git a/lib/libstand/uuid_from_string.c b/lib/libstand/uuid_from_string.c
index 2d5a6dd1973d..7a59b4189ead 100644
--- a/lib/libstand/uuid_from_string.c
+++ b/lib/libstand/uuid_from_string.c
@@ -57,7 +57,7 @@ fromhex(const char *s, int len, int *ok)
 	if (!*ok)
 		return 0;
 	v = 0;
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < len; i++) {
 		h = hex2int(s[i]);
 		if (h == 16) {
 			*ok = 0;