diff --git a/libanjuta/anjuta-token-file.c b/libanjuta/anjuta-token-file.c
index 10f60aa..2637353 100644
--- a/libanjuta/anjuta-token-file.c
+++ b/libanjuta/anjuta-token-file.c
@@ -299,7 +299,7 @@ anjuta_token_file_update (AnjutaTokenFile *file, AnjutaToken *token)
 	for (prev = token; prev != NULL; prev = anjuta_token_previous (prev))
 	{
 		gint flags = anjuta_token_get_flags (prev);
-		if ((anjuta_token_get_string (prev) != NULL) && !(flags & (ANJUTA_TOKEN_ADDED | ANJUTA_TOKEN_REMOVED))) break;
+		if ((anjuta_token_get_length (prev) != 0) && !(flags & (ANJUTA_TOKEN_ADDED | ANJUTA_TOKEN_REMOVED))) break;
 		token = prev;    
 	}
 	
diff --git a/libanjuta/anjuta-token-style.c b/libanjuta/anjuta-token-style.c
index 2e7735f..14b7d15 100644
--- a/libanjuta/anjuta-token-style.c
+++ b/libanjuta/anjuta-token-style.c
@@ -273,7 +273,7 @@ anjuta_token_style_format (AnjutaTokenStyle *style, AnjutaToken *list)
 	for (prev = list; prev != NULL; prev = anjuta_token_previous (prev))
 	{
 		gint flags = anjuta_token_get_flags (prev);
-		if ((anjuta_token_get_string (prev) != NULL) && !(flags & (ANJUTA_TOKEN_ADDED | ANJUTA_TOKEN_REMOVED))) break;
+		if ((anjuta_token_get_length (prev) != 0) && !(flags & (ANJUTA_TOKEN_ADDED | ANJUTA_TOKEN_REMOVED))) break;
 		list = prev;    
 	}