diff --git a/__tests__/renderers/Form/__snapshots__/index.test.tsx.snap b/__tests__/renderers/Form/__snapshots__/index.test.tsx.snap
index 9adcc528..5de43e60 100644
--- a/__tests__/renderers/Form/__snapshots__/index.test.tsx.snap
+++ b/__tests__/renderers/Form/__snapshots__/index.test.tsx.snap
@@ -220,18 +220,17 @@ exports[`Renderer:Form sendOn:true 1`] = `
             </span>
           </label>
           <div
-            class="a-Form-control a-TextControl is-disabled"
+            class="a-Form-control a-TextControl"
           >
             <div
               class="a-TextControl-input"
             >
               <input
                 autocomplete="off"
-                disabled=""
                 name="a"
                 placeholder=""
                 type="text"
-                value=""
+                value="1"
               />
             </div>
           </div>
@@ -247,18 +246,17 @@ exports[`Renderer:Form sendOn:true 1`] = `
             </span>
           </label>
           <div
-            class="a-Form-control a-TextControl is-disabled"
+            class="a-Form-control a-TextControl"
           >
             <div
               class="a-TextControl-input"
             >
               <input
                 autocomplete="off"
-                disabled=""
                 name="b"
                 placeholder=""
                 type="text"
-                value=""
+                value="2"
               />
             </div>
           </div>
@@ -270,8 +268,7 @@ exports[`Renderer:Form sendOn:true 1`] = `
         class="a-Panel-btnToolbar a-Panel-footer"
       >
         <button
-          class="a-Button a-Button--primary is-disabled"
-          disabled=""
+          class="a-Button a-Button--primary"
           type="submit"
         >
           <span>
diff --git a/__tests__/renderers/Form/index.test.tsx b/__tests__/renderers/Form/index.test.tsx
index 1f6548d2..a8becbf7 100644
--- a/__tests__/renderers/Form/index.test.tsx
+++ b/__tests__/renderers/Form/index.test.tsx
@@ -453,5 +453,6 @@ test('Renderer:Form sendOn:true', async () => {
 
     expect(fetcher).toHaveBeenCalled();
     await p0;
+    await wait(10);
     expect(container).toMatchSnapshot();
 });
\ No newline at end of file
diff --git a/src/factory.tsx b/src/factory.tsx
index 27f9a382..2953bcda 100644
--- a/src/factory.tsx
+++ b/src/factory.tsx
@@ -288,7 +288,7 @@ export class RootRenderer extends React.Component<RootRendererProps> {
             || window.location.search && qs.parse(window.location.search.substring(1));
 
         const finalData = query ? createObject({
-            ...(data.__super ? data.__super: null),
+            ...(data && data.__super ? data.__super: null),
             ...query,
             query
         }, data) : data;
diff --git a/tsconfig.json b/tsconfig.json
index aca26a22..4f7c38ee 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,6 +12,7 @@
     "moduleResolution": "node",
     "rootDir": "src",
     "importHelpers": true,
+    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceRoot": "src",
     "noImplicitReturns": true,