diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index ea37bf58d5..1773fa89a2 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -46,27 +46,12 @@ MathInset * MathCharInset::clone() const
 }
 
 
-int MathCharInset::ascent() const
-{
-	return mathed_char_ascent(code_, mi_, char_);
-}
-
-
-int MathCharInset::descent() const
-{
-	return mathed_char_descent(code_, mi_, char_);
-}
-
-
-int MathCharInset::width() const
-{
-	return mathed_char_width(code_, mi_, char_);
-}
-
-
 void MathCharInset::metrics(MathMetricsInfo const & mi) const
 {
 	mi_ = mi;
+	ascent_  = mathed_char_ascent(code_, mi_, char_);
+	descent_ = mathed_char_descent(code_, mi_, char_);
+	width_   = mathed_char_width(code_, mi_, char_);
 }
 
 
diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index fcfa806466..325990280a 100644
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -2,7 +2,7 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -12,7 +12,7 @@
     \author André Pönitz
  */
 
-class MathCharInset : public MathInset {
+class MathCharInset : public MathDimInset {
 public:
 	///
 	explicit MathCharInset(char c);
@@ -36,12 +36,6 @@ public:
 	void writeRaw(std::ostream &) const;
 	///
 	void normalize(NormalStream &) const;
-	/// 
-	int ascent() const;
-	///
-	int descent() const;
-	///
-	int width() const;
 	/// identifies Charinsets
 	MathCharInset const * asCharInset() const { return this; }
 	///