diff --git a/latex/latex.py b/latex/latex.py
index f86604dd5880781df883172a7ac479e0e15c83e8..96ef8fdad27e45dc263f9ccff19f1992ccc07ed1 100644
--- a/latex/latex.py
+++ b/latex/latex.py
@@ -407,7 +407,7 @@ class LatexPlugin(GajimPlugin):
         self.latex_tag = gtk.TextTag('latex')
         self.latex_tag.set_property('foreground', 'blue')
         self.latex_tag.set_property('underline', 'single')
-        d['tag_id'] = self.latex_tag.connect('event', self.textview_event_after)
+        self.latex_tag.connect('event', self.textview_event_after)
         tb.get_tag_table().add(self.latex_tag)
 
         d['h_id'] = tb.connect('changed', self.textbuffer_live_latex_expander)
@@ -418,6 +418,10 @@ class LatexPlugin(GajimPlugin):
     def disconnect_from_chat_control_base(self, chat_control):
         d = chat_control.latexs_expander_plugin_data
         tv = chat_control.conv_textview.tv
+        tb = tv.get_buffer()
 
         tv.get_buffer().disconnect(d['h_id'])
-        self.latex_tag.disconnect(d['tag_id'])
+        tag_table = tb.get_tag_table()
+        tt = tag_table.lookup('latex')
+        if tt:
+            tag_table.remove(tt)
diff --git a/latex/manifest.ini b/latex/manifest.ini
index 7e7c4db5fe91c5b08b6a1743dbd080cebe762ce7..64d714d80d32738e84990f485709d5dc1457dddd 100644
--- a/latex/manifest.ini
+++ b/latex/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Latex
 short_name: latex
-version: 0.2.2
+version: 0.2.3
 description: Invoke Latex to render $$foobar$$ sourrounded Latex equations. Needs latex and dvipng or ImageMagick.
 authors: Yves Fischer <yvesf@xapek.org>
  Yann Leboulanger <asterix@lagaule.org>