diff --git a/src/libprs500/ebooks/lrf/html/convert_from.py b/src/libprs500/ebooks/lrf/html/convert_from.py
index e3b6a2b68b..f667a33587 100644
--- a/src/libprs500/ebooks/lrf/html/convert_from.py
+++ b/src/libprs500/ebooks/lrf/html/convert_from.py
@@ -60,8 +60,8 @@ class HTMLConverter(object):
      
     MARKUP_MASSAGE   = [
                         # Close <a /> tags
-                        (re.compile("(<a\s+.*?)/>|<a/>", re.IGNORECASE), 
-                         lambda match: match.group(1)+"></a>"),
+                        (re.compile(r'<a(\s[^>]*)?/>', re.IGNORECASE), 
+                         lambda match: '<a'+match.group(1)+'></a>'),
                          # Strip comments from <style> tags. This is needed as 
                          # sometimes there are unterminated comments
                         (re.compile(r"<\s*style.*?>(.*?)<\/\s*style\s*>", re.DOTALL|re.IGNORECASE),
@@ -91,7 +91,7 @@ class HTMLConverter(object):
                    lambda match: match.group() if re.match('<', match.group(1).lstrip()) or len(match.group(1)) < 40 
                                 else match.group(1)),
                   # Remove hyphenation
-                  (re.compile(r'-\n|-\n\r'), lambda match: ''),
+                  (re.compile(r'-\n\r?'), lambda match: ''),
                   
                   ]