diff --git a/RTX class/FarField.m b/RTX class/FarField.m
index c97bbc72302d976e6c66f4a9dfecd955e84da0ab..406b9035fe59523741e4e7840ff64f69da103e59 100644
--- a/RTX class/FarField.m	
+++ b/RTX class/FarField.m	
@@ -7,7 +7,7 @@ classdef FarField
     methods (Static)
         function field = CalculateFarField(ntheta, nfi, apertureSize, wavelength, histogram)
             field = zeros(1, ntheta);
-            theta = linspace(-pi/18, pi/18, ntheta);
+            theta = linspace(-pi/6, pi/6, ntheta);
             fi = linspace(0, 2*pi, nfi);
             nr = floor(length(histogram)/2);
             r = linspace(0, apertureSize/2, nr);
diff --git a/RTX class/Trace.m b/RTX class/Trace.m
index b1e98d7a5690299802b2f3251cebbe0f15db4d7d..f9e493c0b8960310f210e36cb5baefe9408ca9b4 100644
--- a/RTX class/Trace.m	
+++ b/RTX class/Trace.m	
@@ -37,9 +37,9 @@ classdef Trace < handle
                     ncol = ncol + 1;
                     next_ray = Ray(col.pos, col.reflDir);
                     obj.rays(end+1) = next_ray;
-                    barriers(col_barrier).post_collide(col, obj);
                     if col.stop
                         obj.trace_end();
+                        barriers(col_barrier).post_collide(col, obj);
                         break;
                     end
                 else