diff --git a/cg/pagament.cpp b/cg/pagament.cpp
index 2f5c058d7..228b38354 100755
--- a/cg/pagament.cpp
+++ b/cg/pagament.cpp
@@ -433,6 +433,7 @@ void TPagamento::set_numero_rate(int n, int sscad, int rdiff)
 
 void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
 { 
+  if (rata == 0) d += scad;
   if (mcomm /* && rata > 0 */)
   {
     int nm   = scad / 30;
@@ -461,7 +462,7 @@ void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
     if (!last && dy < d.day()) 
     d.set_day(dy);
   }        
-  else d += scad;
+  else if (rata > 0) d += scad;
 }
 
 void TPagamento::set_default_type(int type, bool change_existing)