diff --git a/mbtrack2/tracking/wakepotential.py b/mbtrack2/tracking/wakepotential.py
index 953b49a3e7cf8e844be741084ee2bd6079bf43b6..fcd0d50bdd89a67efae8d0a9b22e52dabd68e045 100644
--- a/mbtrack2/tracking/wakepotential.py
+++ b/mbtrack2/tracking/wakepotential.py
@@ -162,9 +162,7 @@ class WakePotential(Element):
             dipole = np.insert(dipole, 0, np.zeros(N+1))
             
         # Interpole on tau0 to get the same size as W0
-        interp_dipole = interp1d(self.tau, dipole, fill_value=0, 
-                             bounds_error=False)
-        dipole0 = interp_dipole(tau0)
+        dipole0 = np.interp(tau0, self.tau, dipole, 0, 0)
             
         setattr(self, "dipole_" + plane, dipole0)
         return dipole0
@@ -270,10 +268,7 @@ class WakePotential(Element):
 
         (tau0, dtau0, W0) = self.prepare_wakefunction(wake_type, self.tau)
         
-        interp_profile = interp1d(self.tau, self.rho, fill_value=0, 
-                                     bounds_error=False)
-        
-        profile0 = interp_profile(tau0)
+        profile0 = np.interp(tau0, self.tau, self.rho, 0, 0)
         
         if wake_type == "Wlong" or wake_type == "Wxquad" or wake_type == "Wyquad":
             Wp = signal.convolve(profile0, W0*-1, mode='same')*dtau0
@@ -307,8 +302,7 @@ class WakePotential(Element):
             self.charge_density(bunch)
             for wake_type in self.types:
                 tau0, Wp = self.get_wakepotential(bunch, wake_type)
-                f = interp1d(tau0 + self.tau_mean, Wp, fill_value = 0, bounds_error = False)
-                Wp_interp = f(bunch["tau"])
+                Wp_interp = np.interp(bunch["tau"], tau0 + self.tau_mean, Wp, 0, 0)
                 if wake_type == "Wlong":
                     bunch["delta"] += Wp_interp * bunch.charge / self.ring.E0
                 elif wake_type == "Wxdip":