diff --git a/matlab/dynare.m b/matlab/dynare.m
index 472888be9dbb93f6b895c6378fe4b911951d24a5..ac26269f684f571b65a19e994da2289cd00103a3 100644
--- a/matlab/dynare.m
+++ b/matlab/dynare.m
@@ -50,9 +50,9 @@ change_path_flag = true;
 % Filter out some options.
 if nargin>1
     id = strfind(varargin,'nopathchange');
-    if ~isempty(id)
+    if ~all(cellfun(@isempty, id))
         change_path_flag = false;
-        varargin(id{1}) = [];
+        varargin(cellfun(@isempty, id) == 0) = [];
     end
 end