diff --git a/designer/src/com/fr/design/mainframe/WorkBookModelAdapter.java b/designer/src/com/fr/design/mainframe/WorkBookModelAdapter.java
index acd192b86..922aa4a1c 100644
--- a/designer/src/com/fr/design/mainframe/WorkBookModelAdapter.java
+++ b/designer/src/com/fr/design/mainframe/WorkBookModelAdapter.java
@@ -52,7 +52,7 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
 	public Parameter[] getTableDataParameters() {
 		TableDataSource source = this.getBook();
 		Calculator c = Calculator.createCalculator();
-		c.setAttribute(TableDataSource.class, source);
+		c.setAttribute(TableDataSource.KEY, source);
 		java.util.List<ParameterProvider> list = new java.util.ArrayList<ParameterProvider>();
 		java.util.Iterator<String> nameIt = this.getBook().getTableDataNameIterator();
 		while (nameIt.hasNext()) {
diff --git a/designer_base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java b/designer_base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java
index d7918609c..4949661d0 100644
--- a/designer_base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java
+++ b/designer_base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java
@@ -50,7 +50,7 @@ public class PreviewTableModel extends AbstractTableModel {
             maxRowCount = rowCount;
         }
         final int finalRowCount = maxRowCount;
-        DataModel dm = new DataModel() {
+        DataModel dm = new AbstractDataModel() {
 
             @Override
             public void release() throws Exception {