diff --git a/common/src/main/java/com/genexus/util/DelimitedFilesSafe.java b/common/src/main/java/com/genexus/util/DelimitedFilesSafe.java
index aee198177..770c01177 100644
--- a/common/src/main/java/com/genexus/util/DelimitedFilesSafe.java
+++ b/common/src/main/java/com/genexus/util/DelimitedFilesSafe.java
@@ -498,6 +498,7 @@ public byte dfrgdate(java.util.Date[] date, String fmt, String sep)
 		String retstr;
 		Date retdate = CommonUtil.nullDate();
 		int year = 0, month = 0, day = 0;
+		boolean getnexttoken = true;
 
 		if (dfropen_in_use)
 		{
@@ -506,6 +507,8 @@ public byte dfrgdate(java.util.Date[] date, String fmt, String sep)
 				String stringDelimitedField = actline.nextToken(fdel);
 				if(fdel.equals(stringDelimitedField) || stringDelimitedField.equals(""))
 				{ // Si el token debe estar vac�o...
+					if (fdel.equals(stringDelimitedField))
+						getnexttoken = false;
 					stringDelimitedField = "";
 				}
 
@@ -563,7 +566,8 @@ else if (month < 1 || month > 12 || day < 1 || day > 31)
 		date[0] = retdate;
 		try
 		{
-			String stringDelimitedField = actline.nextToken(fdel);
+			if (getnexttoken)
+				actline.nextToken(fdel);
 		}
 		catch(Exception e)
 		{//Se sabe que se puede leer un token que no existe al final de la linea