diff --git a/include/msksheet.cpp b/include/msksheet.cpp
index 13b577da0..e2aa1b119 100755
--- a/include/msksheet.cpp
+++ b/include/msksheet.cpp
@@ -3008,7 +3008,7 @@ void TSheet_field::on_idle()
 // Ricopia i campi della maschera nel record dato 
 void TSheet_field::mask2row(int n, TToken_string & rec)
 {
-  const TMask& m = sheet_mask();
+  const TMask& m = sheet_row_mask(n);
 
   rec.cut(0);
   const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
@@ -3062,10 +3062,9 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
 {
   TString val(80);   
   
-  TMask& m = sheet_mask();
+  TMask& m = sheet_row_mask(n);
   const int campi = m.fields();
   const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
-  int i;  // Contatore di tutti i cicli successivi
   
   for (short id = FIRST_FIELD; id <= _last_column_id; id++)
   {                                 
@@ -3084,7 +3083,7 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
 
   if (mode > 0)
   {
-    for (i = 0; i < campi; i++)
+    for (int i = 0; i < campi; i++)
     {
       TMask_field& f = m.fld(i);
       const short id = f.dlg();
@@ -3102,14 +3101,14 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
     }
   }  
   
-  for (i = 0; i < campi; i++)
+  for (int i = 0; i < campi; i++)
   {
     TMask_field& f = m.fld(i);
     if (f.dirty() == TRUE)
       f.set_dirty(FALSE);
   }
   
-  val.format("Riga %d", n+1);
+  val = TR("Riga"); val << ' ' << (n+1);
   m.set_caption(val);
 }