diff --git a/demo-shell-ng2/app/components/form/form-list-demo.component.ts b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
index b10644f03d..162b04084b 100644
--- a/demo-shell-ng2/app/components/form/form-list-demo.component.ts
+++ b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
@@ -25,8 +25,8 @@ import { ActivitiForm } from 'ng2-activiti-form';
         <adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
         </adf-form-list>
         <div class="form-container" *ngIf="!isEmptyForm()">
-            <activiti-form [form]="form" [data]="restoredData">
-            </activiti-form>
+            <adf-form [form]="form" [data]="restoredData">
+            </adf-form>
         </div>
         <button md-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
         <button md-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button>
diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts
index 593d7bc8f7..d6d786bade 100644
--- a/ng2-components/ng2-activiti-form/src/services/form.service.ts
+++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts
@@ -82,7 +82,7 @@ export class FormService {
 
     parseForm(json: any, data?: FormValues, readOnly: boolean = false): FormModel {
         if (json) {
-            let form = new FormModel(json, data, readOnly, this);
+            let form = new FormModel(json.formDefinition, data, readOnly, this);
             if (!json.fields) {
                 form.outcomes = [
                     new FormOutcomeModel(form, {