diff --git a/Tribler/Main/vwxGUI/TorrentStateManager.py b/Tribler/Main/vwxGUI/TorrentStateManager.py
index 987ded803aa..bba0073f142 100644
--- a/Tribler/Main/vwxGUI/TorrentStateManager.py
+++ b/Tribler/Main/vwxGUI/TorrentStateManager.py
@@ -89,7 +89,7 @@ def create_and_seed_metadata_thumbnail(self, thumbnail_file, torrent, modificati
                 file_name = u"%s.%s" % (thumbnail_hash_str, fmt)
 
                 sub_file_path = os.path.join(hexlify(torrent.infohash), file_name)
-                # TODO
+                # FIXME(lipu): fix the thumbnail path to use metadata
                 sub_dir_path = os.path.join(u"", hexlify(torrent.infohash))
                 file_path = os.path.join(u"", sub_file_path)
 
diff --git a/Tribler/Main/vwxGUI/home.py b/Tribler/Main/vwxGUI/home.py
index 5351685754d..9ea940c0f93 100644
--- a/Tribler/Main/vwxGUI/home.py
+++ b/Tribler/Main/vwxGUI/home.py
@@ -968,7 +968,7 @@ def SetData(self, delayedResult):
         torrents = delayedResult.get()
 
         for torrent in torrents:
-            # TODO
+            # FIXME(lipu): fix the thumbnail path to use metadata
             thumb_path = os.path.join(
                 u"",
                 binascii.hexlify(torrent.infohash))
diff --git a/Tribler/Main/vwxGUI/list_details.py b/Tribler/Main/vwxGUI/list_details.py
index b6e51991285..d73a890db4b 100644
--- a/Tribler/Main/vwxGUI/list_details.py
+++ b/Tribler/Main/vwxGUI/list_details.py
@@ -551,7 +551,7 @@ def updateDetailsTab(self):
         self.channel.Show(show_channel)
 
         # Toggle thumbnails
-        # TODO
+        # FIXME(lipu): fix the thumbnail path to use metadata
         thumb_dir = os.path.join(u"",
                                  binascii.hexlify(self.torrent.infohash))
         thumb_files = [os.path.join(dp, fn) for dp, _, fns in os.walk(thumb_dir)
@@ -1656,7 +1656,7 @@ def do_gui(delayedResult):
                     self.playlist_torrents = delayedResult.get()
                     bmps = []
                     for torrent in self.playlist_torrents:
-                        # TODO
+                        # FIXME(lipu): fix the thumbnail path to use metadata
                         thumb_dir = os.path.join(u"",
                                                  binascii.hexlify(torrent.infohash))
                         thumb_files = [os.path.join(dp, fn) for dp, _, fns in os.walk(thumb_dir)
diff --git a/Tribler/Main/vwxGUI/list_item.py b/Tribler/Main/vwxGUI/list_item.py
index e4f1f2e7e57..1eaa2ab4ae3 100644
--- a/Tribler/Main/vwxGUI/list_item.py
+++ b/Tribler/Main/vwxGUI/list_item.py
@@ -391,7 +391,7 @@ def RefreshData(self, data):
                 'completed' not in self.original_data.state and 'active' not in self.original_data.state)
 
     def SetThumbnailIcon(self):
-        # TODO
+        # FIXME(lipu): fix the thumbnail path to use metadata
         torcoldir = u""
         rel_thumbdir = binascii.hexlify(self.original_data.infohash)
         abs_thumbdir = os.path.join(torcoldir, rel_thumbdir)
@@ -1044,7 +1044,7 @@ def CreateBitmaps(self):
 
         bitmap = None
 
-        # TODO
+        # FIXME(lipu): fix the thumbnail path to use metadata
         thumb_dir = os.path.join(
             u"",
             binascii.hexlify(self.original_data.infohash))
@@ -1390,7 +1390,7 @@ def AddComponents(self, leftSpacer, rightSpacer):
             self.guiutility = GUIUtility.getInstance()
             self.session = self.guiutility.utility.session
 
-            # TODO
+            # FIXME(lipu): fix the thumbnail path to use metadata
             thumb_dir = os.path.join(
                 u"",
                 binascii.hexlify(modification.torrent.infohash))
@@ -1465,7 +1465,7 @@ def AddComponents(self, leftSpacer, rightSpacer):
             self.guiutility = GUIUtility.getInstance()
             self.session = self.guiutility.utility.session
 
-            # TODO
+            # FIXME(lipu): fix the thumbnail path to use metadata
             thumb_dir = os.path.join(
                 u"",
                 binascii.hexlify(modification.torrent.infohash))
diff --git a/Tribler/Test/test_metadata_community.py b/Tribler/Test/test_metadata_community.py
index 7fb31ada1b7..58f19e5eb31 100644
--- a/Tribler/Test/test_metadata_community.py
+++ b/Tribler/Test/test_metadata_community.py
@@ -46,7 +46,7 @@ def check_for_modifications():
                 5, do_overview), 'No valid channel modifications received')
 
         def do_thumbnails(torrentfilename):
-            # TODO
+            # FIXME(lipu): fix the thumbnail path to use metadata
             thumb_dir = os.path.join(u"", '8bb88a02da691636a7ed929b87d467f24700e490')
             self.CallConditional(120, lambda: os.path.isdir(thumb_dir) and len(
                 os.listdir(thumb_dir)) > 0, lambda: do_modifications(torrentfilename), 'No thumbnails were created')