diff --git a/libraries/libldap/t61.c b/libraries/libldap/t61.c
index 3245c42fc5..e5c89bf811 100644
--- a/libraries/libldap/t61.c
+++ b/libraries/libldap/t61.c
@@ -684,6 +684,8 @@ int ldap_utf8s_to_t61s( struct berval *src, struct berval *dst )
 			*d++ = 0x3f;
 			break;
 		}
+		i += j;
+		c += j;
 	}
 	*d = '\0';
 	return LDAP_SUCCESS;