diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
index 2f9d12c89d..dfbb8f403f 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
@@ -276,10 +276,10 @@ export class FormFieldModel extends FormWidgetModel {
                 }
                 break;
             case FormFieldTypes.NUMBER:
-                this.form.values[this.id] = parseInt(this.value);
+                this.form.values[this.id] = parseInt(this.value, 10);
                 break;
             case FormFieldTypes.AMOUNT:
-                this.form.values[this.id] = parseFloat(this.value);
+                this.form.values[this.id] = this.enableFractions ? parseFloat(this.value) : parseInt(this.value, 10);
                 break;
             default:
                 if (!FormFieldTypes.isReadOnlyType(this.type)) {