diff --git a/MATLAB/Algorithms/PICCS.m b/MATLAB/Algorithms/PICCS.m
index 569f4aa7..1e05e617 100644
--- a/MATLAB/Algorithms/PICCS.m
+++ b/MATLAB/Algorithms/PICCS.m
@@ -85,14 +85,7 @@
 % Projection weigth, W
 
 
-geoaux=geo;
-geoaux.sVoxel([1 2])=geo.sVoxel([1 2])*1.1; % a Bit bigger, to avoid numerical division by zero (small number)
-geoaux.sVoxel(3)=max(geo.sDetector(2),geo.sVoxel(3)); % make sure lines are not cropped. One is for when image is bigger than detector and viceversa
-geoaux.nVoxel=[2,2,2]'; % accurate enough?
-geoaux.dVoxel=geoaux.sVoxel./geoaux.nVoxel;
-W=Ax(ones(geoaux.nVoxel','single'),geoaux,angles,'Siddon','gpuids',gpuids);  %
-W(W<min(geo.dVoxel)/4)=Inf;
-W=1./W;
+W=computeW(geo,angles,gpuids);
 
 
 % Back-Projection weigth, V
diff --git a/Python/tigre/algorithms/iterative_recon_alg.py b/Python/tigre/algorithms/iterative_recon_alg.py
index d9bc31f5..9e837e75 100644
--- a/Python/tigre/algorithms/iterative_recon_alg.py
+++ b/Python/tigre/algorithms/iterative_recon_alg.py
@@ -240,7 +240,7 @@ def set_w(self):
         :return: None
         """
         geox = copy.deepcopy(self.geo)
-        geox.sVoxel[1:] = geox.sVoxel[1:] * 1.1  # a bit larger to avoid zeros in projections
+        geox.sVoxel[1:] = geox.sDetector[1:] * 1.1  # a bit larger to avoid zeros in projections
         geox.sVoxel[0] = max(geox.sDetector[0], geox.sVoxel[0])
 
         geox.nVoxel = np.array([2, 2, 2])
@@ -250,6 +250,7 @@ def set_w(self):
         )
         W[W <= min(self.geo.dVoxel / 2)] = np.inf
         W = 1.0 / W
+        W[W > 0.1] = 0.1
         setattr(self, "W", W)
 
     def set_v(self):