diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index b99a5584d..808ceaac5 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -405,8 +405,10 @@ void TDocumento_mask::insert_anal_page()
 				insert_anal_fields(*this, newpage, LF_COMMESSE, y, dlg, dlgd, cms_req);
 			}
 		}
-		set_field_handler(_cms_end, codcms_handler);
 	}
+  if (_cms_start > 0 && _cdc_start > 0)
+    set_field_handler(_cms_end, codcms_handler);
+
 	if (use_fsc && fasinfo.parent() <= 0)
 		insert_anal_fields(*this, newpage, LF_FASI, y, dlg, dlgd, fsc_req);
 }
diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp
index 8c8216670..88cf769a5 100755
--- a/ve/velib06a.cpp
+++ b/ve/velib06a.cpp
@@ -2178,11 +2178,11 @@ bool codcms_handler(TMask_field& f, KEY key)
 	if ((key == K_TAB && f.focusdirty()) || key == K_ENTER)
 	{
 		const TRectype & curr = mask.efield(mask.cms_start()).browse()->cursor()->curr();
-		const TString codcosto = curr.get(COMMESSE_CODCOSTO);
 		const TString & codcms = curr.get(COMMESSE_CODCMS);
 
 		if (mask.cdc_start() >= 0 && mask.codcms() != codcms)
 		{
+      const TString codcosto = curr.get(COMMESSE_CODCOSTO);
 			for (short i = mask.cdc_start(); i <= mask.cdc_end(); i++)
 			{
 				TEdit_field & e = mask.efield(i);