diff --git a/XLForm/XL/Cell/XLFormTextFieldCell.m b/XLForm/XL/Cell/XLFormTextFieldCell.m
index f8531229..237bd0f4 100644
--- a/XLForm/XL/Cell/XLFormTextFieldCell.m
+++ b/XLForm/XL/Cell/XLFormTextFieldCell.m
@@ -261,7 +261,10 @@ - (void)textFieldDidEndEditing:(UITextField *)textField
 - (void)textFieldDidChange:(UITextField *)textField{
     if([self.textField.text length] > 0) {
         if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeNumber] || [self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeDecimal]){
-            self.rowDescriptor.value =  @([self.textField.text doubleValue]);
+	    NSNumberFormatter * myNumFormatter = [[NSNumberFormatter alloc] init];
+	    [myNumFormatter setLocale:[NSLocale currentLocale]];
+	    [myNumFormatter setNumberStyle:NSNumberFormatterDecimalStyle];
+	    self.rowDescriptor.value =  [myNumFormatter numberFromString:self.textField.text];
         } else if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeInteger]){
             self.rowDescriptor.value = @([self.textField.text integerValue]);
         } else {
diff --git a/XLForm/XL/Controllers/XLFormViewController.m b/XLForm/XL/Controllers/XLFormViewController.m
index a233abe6..b01c17ce 100755
--- a/XLForm/XL/Controllers/XLFormViewController.m
+++ b/XLForm/XL/Controllers/XLFormViewController.m
@@ -411,7 +411,7 @@ -(XLFormRowDescriptor *)formRowFormMultivaluedFormSection:(XLFormSectionDescript
     if (formSection.multivaluedRowTemplate){
         return [formSection.multivaluedRowTemplate copy];
     }
-    XLFormRowDescriptor * formRowDescriptor = [[formSection.formRows objectAtIndex:0] copy];
+    XLFormRowDescriptor * formRowDescriptor = [[formSection.formRows lastObject] copy];
     formRowDescriptor.tag = nil;
     return formRowDescriptor;
 }