Index: /issm/trunk-jpl/src/m/classes/clusters/generic_static.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/generic_static.m	(revision 18367)
+++ /issm/trunk-jpl/src/m/classes/clusters/generic_static.m	(revision 18368)
@@ -2,7 +2,7 @@
 %
 %   Usage:
-%      cluster=generic_static.m('name','astrid','np',3);
+%      cluster=generic_static('name','astrid','np',3);
 
-classdef generic_static.m
+classdef generic_static
 	properties (SetAccess=public) 
 		% {{{
@@ -10,9 +10,11 @@
 		np=1;
 		codepath=fileparts(which('issm.exe'));
+		executionpath = '.';
+		interactive = 1;
 		shell='/bin/sh';
 		%}}}
 	end
 	methods
-		function cluster=generic_static.m(varargin) % {{{
+		function cluster=generic_static(varargin) % {{{
 
 			%use provided options to change fields
Index: /issm/trunk-jpl/src/m/solve/waitonlock.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/waitonlock.m	(revision 18367)
+++ /issm/trunk-jpl/src/m/solve/waitonlock.m	(revision 18368)
@@ -27,5 +27,5 @@
 
 %If we are using the generic cluster in interactive mode, job is already complete
-if isa(cluster,'generic') & cluster.interactive
+if (isa(cluster,'generic') & cluster.interactive) | isa(cluster,'generic_static'),
 	%We are in interactive mode, no need to check for job completion
 	ispresent=1;