diff --git a/mbtrack2/utilities/misc.py b/mbtrack2/utilities/misc.py
index 7e29f9fd9980a7a08bc04288c91f3eb6a6551efa..8e688d00388ecd37a78f069fda4650c714d81c52 100644
--- a/mbtrack2/utilities/misc.py
+++ b/mbtrack2/utilities/misc.py
@@ -286,21 +286,13 @@ def yokoya_elliptic(x_radius, y_radius):
             yokydip_pp = np.pi**2/12
             yokxquad_pp = -np.pi**2/24
             yokyquad_pp = np.pi**2/24
-            if y_radius > x_radius:
-                yokxdip_pp, yokydip_pp = yokydip_pp, yokxdip_pp
-                yokxquad_pp, yokyquad_pp = yokyquad_pp, yokxquad_pp
 
             small_semiaxis_th = large_semiaxis*(1-qr_th)/(1+qr_th)
             F_th = np.sqrt(large_semiaxis**2 - small_semiaxis_th**2)
             mu_b_th = np.arccosh(large_semiaxis/F_th)
 
-            yoklong_th = 0.0
-            yokxdip_th = 0.0
-            yokydip_th = 0.0
-            yokxquad_th = 0.0
-
-            ip_range = np.arange(50)
-            il_range = np.arange(50)
+            ip_range = np.arange(51)
+            il_range = np.arange(51)
             ip, il = np.meshgrid(ip_range, il_range, indexing="ij")
 
             ff_values = np.array(function_ff(small_semiaxis_th, F_th, mu_b_th, ip, il))
@@ -319,6 +311,8 @@ def yokoya_elliptic(x_radius, y_radius):
             if y_radius > x_radius:
                 yokxdip_th, yokydip_th = yokydip_th, yokxdip_th
                 yokxquad_th, yokyquad_th = yokyquad_th, yokxquad_th
+                yokxdip_pp, yokydip_pp = yokydip_pp, yokxdip_pp
+                yokxquad_pp, yokyquad_pp = yokyquad_pp, yokxquad_pp
 
             qr_array = np.array([qr_th, 1.0])
             yoklong_array = np.array([yoklong_th, yoklong_pp])
@@ -334,13 +328,8 @@ def yokoya_elliptic(x_radius, y_radius):
             yokyquad = np.interp(qr, qr_array, yokyquad_array)
 
         else:
-            yoklong = 0.0
-            yokxdip = 0.0
-            yokydip = 0.0
-            yokxquad = 0.0
-
-            ip_range = np.arange(50)
-            il_range = np.arange(50)
+            ip_range = np.arange(51)
+            il_range = np.arange(51)
             ip, il = np.meshgrid(ip_range, il_range, indexing="ij")
 
             ff_values = np.array(function_ff(small_semiaxis, F, mu_b, ip, il))