--- a/+grid/evalOn.m	Fri Oct 20 23:13:43 2017 +0200
+++ b/+grid/evalOn.m	Fri Oct 20 23:24:42 2017 +0200
@@ -16,7 +16,7 @@
     assert(g.D == nargin(func),'grid:evalOn:WrongNumberOfInputs', 'The number of inputs of the function must match the dimension of the domain.')
 
     x = num2cell(g.points(),1);
-    k = numberOfComponents(func, x);
+    k = numberOfComponents(func);
 
     gf = func(x{:});
 
@@ -29,12 +29,9 @@
 end
 
 % Find the number of vector components of func
-function k = numberOfComponents(func, x)
-    x0 = num2cell(ones(1,size(x,2)));
-
+function k = numberOfComponents(func)
+    x0 = num2cell(ones(1,nargin(func)));
     f0 = func(x0{:});
-    % k = number of components
+    assert(size(f0,2) == 1, 'grid:evalOn:VectorValuedWrongDim', 'A vector valued function must be given as a column vector');
     k = length(f0);
-
-    assert(size(f0,2) == 1, 'grid:evalOn:VectorValuedWrongDim', 'A vector valued function must be given as a column vector');
-end
\ No newline at end of file
+end