diff --git a/pykCSD/KCSD2D.py b/pykCSD/KCSD2D.py
index 4bdc4ee..9a5dbcc 100644
--- a/pykCSD/KCSD2D.py
+++ b/pykCSD/KCSD2D.py
@@ -114,9 +114,9 @@ def set_parameters(self, params):
         nx = (self.xmax - self.xmin)/self.gdX + 1
         ny = (self.ymax - self.ymin)/self.gdY + 1
 
-        lin_x = np.linspace(self.xmin, self.xmax, nx)
-        lin_y = np.linspace(self.ymin, self.ymax, ny)
-        self.space_X, self.space_Y = np.meshgrid(lin_x, lin_y)
+        self.space_X, self.space_Y = np.mgrid[self.xmin:self.xmax:np.complex(0,nx),
+                                              self.ymin:self.ymax:np.complex(0,ny)]
+
 
         (self.X_src, self.Y_src, self.R) = sd.make_src_2D(
             self.space_X,
diff --git a/pykCSD/source_distribution.py b/pykCSD/source_distribution.py
index 2f04b36..26163cc 100644
--- a/pykCSD/source_distribution.py
+++ b/pykCSD/source_distribution.py
@@ -127,10 +127,8 @@ def make_src_2D(X, Y, n_src, ext_x, ext_y, R_init):
     ext_x_n = (Lx_nn - Lx)/2
     ext_y_n = (Ly_nn - Ly)/2
 
-    lin_x = np.linspace(np.min(X) - ext_x_n, np.max(X) + ext_x_n, nx)
-    lin_y = np.linspace(np.min(Y) - ext_y_n, np.max(Y) + ext_y_n, ny)
-
-    X_src, Y_src = np.meshgrid(lin_x, lin_y)
+    X_src, Y_src = np.mgrid[(np.min(X) - ext_x_n):(np.max(X) + ext_x_n):np.complex(0,nx),
+                            (np.min(Y) - ext_y_n):(np.max(Y) + ext_y_n):np.complex(0,ny)]
 
     d = round(R_init/ds)
     R = d * ds
@@ -247,6 +245,7 @@ def make_src_3D(X, Y, Z, n_src, ext_x, ext_y, ext_z, R_init):
 
     (X_src, Y_src, Z_src) = np.meshgrid(lin_x, lin_y, lin_z)
 
+
     d = np.round(R_init/ds)
     R = d * ds