Index: xl/media/__init__.py =================================================================== --- xl/media/__init__.py (revision 2650) +++ xl/media/__init__.py (working copy) @@ -393,6 +393,8 @@ try: formats[ext].fill_tag_from_path(tr) + for t in ('artist', 'album', 'track'): + setattr(tr, t, getattr(tr, t).split(u'\0')[0]) except HeaderNotFoundError: print "Possibly corrupt file: " + uri except: