1 files changed, 5 insertions, 5 deletions

diff --git a/src/tag.c b/src/tag.c
index 3f95f024d..8131790e2 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -54,16 +54,20 @@ void printMpdTag(FILE * fp, MpdTag * tag) {
 		temp = latin1StrToUtf8Dup(str); \
 		free(str); \
 		str = temp; \
-		stripReturnChar(str); \
 	} \
 }
 
 void validateUtf8Tag(MpdTag * tag) {
 	fixUtf8(tag->artist);
+	stripReturnChar(tag->artist);
 	fixUtf8(tag->album);
+	stripReturnChar(tag->artist);
 	fixUtf8(tag->track);
+	stripReturnChar(tag->artist);
 	fixUtf8(tag->title);
+	stripReturnChar(tag->artist);
 	fixUtf8(tag->name);
+	stripReturnChar(tag->artist);
 }
 
 #ifdef HAVE_ID3TAG
@@ -99,28 +103,24 @@ MpdTag * parseId3Tag(struct id3_tag * tag) {
 	str = getID3Info(tag,ID3_FRAME_ARTIST);
 	if(str) {
 		if(!ret) ret = newMpdTag();
-		stripReturnChar(str);
 		ret->artist = str;
 	}
 
 	str = getID3Info(tag,ID3_FRAME_TITLE);
 	if(str) {
 		if(!ret) ret = newMpdTag();
-		stripReturnChar(str);
 		ret->title = str;
 	}
 
 	str = getID3Info(tag,ID3_FRAME_ALBUM);
 	if(str) {
 		if(!ret) ret = newMpdTag();
-		stripReturnChar(str);
 		ret->album = str;
 	}
 
 	str = getID3Info(tag,ID3_FRAME_TRACK);
 	if(str) {
 		if(!ret) ret = newMpdTag();
-		stripReturnChar(str);
 		ret->track = str;
 	}