diff --git a/src/gemparse.c b/src/gemparse.c
index a08727a..11ff499 100644
--- a/src/gemparse.c
+++ b/src/gemparse.c
@@ -115,7 +115,7 @@ parseFile (const char *path)
 				beginUrl++;
 
 			//Get URL lenght
-			while (beginUrl + urlLen < size && line[beginUrl + urlLen] != ' ')
+			while (beginUrl + urlLen < size && line[beginUrl + urlLen] != ' ' && line[beginUrl + urlLen] != '\n')
 				urlLen++;
 
 			//mark end of url
@@ -136,7 +136,7 @@ parseFile (const char *path)
 			//If not text, text = url
 			if (beginText == size)
 #ifdef TESTGEMPARSE
-				addLink (line + beginUrl, links[linkNumber]);
+				addLink (line + beginUrl, line + beginUrl);
 #else
 				addLink (render, links[linkNumber], links[linkNumber]);
 #endif