diff --git a/resources/lib/lib_joyn.py b/resources/lib/lib_joyn.py
index 48941b8..2833da7 100644
--- a/resources/lib/lib_joyn.py
+++ b/resources/lib/lib_joyn.py
@@ -16,6 +16,7 @@
 if compat.PY2:
 	from urllib import urlencode
 	from HTMLParser import HTMLParser
+	html = HTMLParser()
 	from urlparse import urlparse, parse_qs
 	try:
 		from simplejson import dumps
@@ -23,7 +24,7 @@
 		from json import dumps
 elif compat.PY3:
 	from urllib.parse import urlencode, urlparse, parse_qs
-	from html.parser import HTMLParser
+	import html
 	from json import dumps
 
 
@@ -704,7 +705,7 @@ def get_metadata(data, query_type, title_type_id=None):
 		if 'TEXTS' in CONST['GRAPHQL']['METADATA'][query_type].keys():
 			for text_key, text_mapping_key in CONST['GRAPHQL']['METADATA'][query_type]['TEXTS'].items():
 				if text_key in data.keys() and data[text_key] is not None:
-					metadata['infoLabels'].update({text_mapping_key: HTMLParser().unescape(data[text_key])})
+					metadata['infoLabels'].update({text_mapping_key: html.unescape(data[text_key])})
 				else:
 					metadata['infoLabels'].update({text_mapping_key: ''})
 
@@ -794,7 +795,7 @@ def get_metadata(data, query_type, title_type_id=None):
 				})
 			if 'series' in data.keys():
 				if 'title' in data['series'].keys():
-					metadata['infoLabels'].update({'tvshowtitle': HTMLParser().unescape(data['series']['title'])})
+					metadata['infoLabels'].update({'tvshowtitle': html.unescape(data['series']['title'])})
 				series_meta = lib_joyn.get_metadata(data['series'], 'TVSHOW')
 				if 'clearlogo' in series_meta['art'].keys():
 					metadata['art'].update({'clearlogo': series_meta['art']['clearlogo']})
@@ -802,7 +803,7 @@ def get_metadata(data, query_type, title_type_id=None):
 			elif 'compilation' in data.keys():
 				compilation_meta = lib_joyn.get_metadata(data['compilation'], 'TVSHOW')
 				if 'title' in data['compilation'].keys():
-					metadata['infoLabels'].update({'tvshowtitle': HTMLParser().unescape(data['compilation']['title'])})
+					metadata['infoLabels'].update({'tvshowtitle': html.unescape(data['compilation']['title'])})
 				if 'clearlogo' in compilation_meta['art'].keys():
 					metadata['art'].update({'clearlogo': compilation_meta['art']['clearlogo']})