diff --git a/components/tvplanit/source/vpbufds.pas b/components/tvplanit/source/vpbufds.pas
index 7f1456652..c132e2870 100644
--- a/components/tvplanit/source/vpbufds.pas
+++ b/components/tvplanit/source/vpbufds.pas
@@ -135,11 +135,12 @@ begin
      CreateFieldDefs(ATableName, table.FieldDefs);
      if FUseAutoInc then
        table.FieldDefs[0].DataType := ftAutoInc;
+     table.IndexDefs.Clear;
+     table.IndexDefs.Update;
+     CreateIndexDefs(ATableName, table.IndexDefs);
      table.CreateDataset;
-  end;
-  table.IndexDefs.Clear;
-  table.IndexDefs.Update;
-  CreateIndexDefs(ATableName, table.IndexDefs);
+  end else
+    table.Open;
 end;
 
 procedure TVpBufDSDatastore.CreateTables;