diff --git a/gridstack/gridstack-tests.ts b/gridstack/gridstack-tests.ts
index 96aa14b19f..9330d2019e 100644
--- a/gridstack/gridstack-tests.ts
+++ b/gridstack/gridstack-tests.ts
@@ -4,13 +4,17 @@
 
 // Type definitions for Gridstack
 // Project: http://troolee.github.io/gridstack.js/
-// Definitions by: Pascal Senn <https://github.com/PascalSenn/>
+// Definitions by: Pascal Senn <https://github.com/PascalSenn/>, Ricky Blankenaufulland <https://github.com/ZoolWay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 var options = <IGridstackOptions> {
     float: true
 };
-var gridstack:GridStack = $(document).gridstack(options);
+var element: JQuery = $(document).gridstack(options);
+var gridstack: GridStack = $(document).data("gridstack");
+var gsFromElement: GridStack = element.data("gridstack");
+
+if (gridstack !== gsFromElement) throw Error('These should match!');
 
 gridstack.addWidget("test", 1, 2, 3, 4, true);
 gridstack.batchUpdate();
diff --git a/gridstack/index.d.ts b/gridstack/index.d.ts
index 12c3600f6a..8d912e3a33 100644
--- a/gridstack/index.d.ts
+++ b/gridstack/index.d.ts
@@ -1,10 +1,11 @@
 // Type definitions for Gridstack
 // Project: http://troolee.github.io/gridstack.js/
-// Definitions by: Pascal Senn <https://github.com/PascalSenn/>
+// Definitions by: Pascal Senn <https://github.com/PascalSenn/>, Ricky Blankenaufulland <https://github.com/ZoolWay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface JQuery {
-    gridstack (options: IGridstackOptions):GridStack
+    gridstack (options: IGridstackOptions): JQuery;
+    data(key: "gridstack"): GridStack;
 }
 
 interface GridStack {