diff --git a/ChangeLog b/ChangeLog
index 1902a99167..d5c3875f17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-18  Juergen Vigna  <jug@sad.it>
+
+	* src/CutAndPaste.C: made textclass a static member of the class
+	as otherwise it is not accesed right!!!
+
 2000-04-17  Dekel Tsur  <dekel@math.tau.ac.il>
 
 	* forms/layout_forms.fd
diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index d2707ff01c..8a8d5dad58 100644
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -21,6 +21,7 @@
 using std::pair;
 
 static LyXParagraph * buf = 0;
+static LyXTextClassList::size_type textclass;
 
 // for now here this should be in another Cut&Paste Class!
 //
diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index 3f7fece807..edc4ae0a36 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -47,8 +47,6 @@ public:
 private:
 	///
 	void DeleteBuffer();
-	///
-	LyXTextClassList::size_type textclass;
 };
 
 #endif