diff --git a/tracking/rf.py b/tracking/rf.py
index d1c24010bfbf8722e0381604ba00580df15a42e9..9ed3b00e497f617a64dccaad4e3ac758fc1b9102 100644
--- a/tracking/rf.py
+++ b/tracking/rf.py
@@ -219,13 +219,16 @@ class CavityResonator():
                 for i, center0 in enumerate(center):
                     mp_per_bin = profile[i]
                     
-                    if index == self.bunch_index:
-                        ind = (sorted_index == i)
-                        Vgene = self.Vg*np.cos(self.m*self.ring.omega1*bunch["tau"][ind] + self.theta_g)
-                        Vbeam = np.real(self.beam_phasor)
-                        Vtot = Vgene + Vbeam - charge_per_mp*self.loss_factor*mp_per_bin
-                        energy_change[ind] = Vtot / self.ring.E0
-                        
+                    if mp_per_bin == 0:
+                        self.phasor_decay(bin_length)
+                        continue
+                    
+                    ind = (sorted_index == i)
+                    Vgene = self.Vg*np.cos(self.m*self.ring.omega1*bunch["tau"][ind] + self.theta_g)
+                    Vbeam = np.real(self.beam_phasor)
+                    Vtot = Vgene + Vbeam - charge_per_mp*self.loss_factor*mp_per_bin
+                    energy_change[ind] = Vtot / self.ring.E0
+
                     self.phasor_decay(bin_length)
                     
                     self.beam_phasor -= 2*charge_per_mp*self.loss_factor*mp_per_bin