diff --git a/ChangeLog b/ChangeLog
index bc70d19be..d6016a89e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Version 0.1.0:
     * Fix issue where track resolving spinner never stopped if tracks were
       removed from playlist while resolving.
-    * Fix issues with stations where multiple tracks could be added at once
+    * Fix issues with stations where multiple tracks could be added at once.
     * Allow multiple accounts of the same type.
     * Add new Google account type that is a thin wrapper around a Jabber plugin.
     * Overhaul the settings dialog interface.
diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp
index ff2bc6b08..e4e5aa8df 100644
--- a/src/libtomahawk/source.cpp
+++ b/src/libtomahawk/source.cpp
@@ -117,7 +117,8 @@ Source::friendlyName() const
 void
 Source::setAvatar( const QPixmap& avatar )
 {
-    //HACK: we should really properly make sure that only the GUI thread ever accesses this function
+    //FIXME: use a proper pixmap store that's thread-safe
+    delete m_avatar;
     m_avatar = new QPixmap( avatar );
 }
 
@@ -125,7 +126,7 @@ Source::setAvatar( const QPixmap& avatar )
 QPixmap
 Source::avatar() const
 {
-    //HACK: we should really properly make sure that only the GUI thread ever accesses this function
+    //FIXME: use a proper pixmap store that's thread-safe
     if ( m_avatar )
         return QPixmap( *m_avatar );
     else