diff --git a/LoadCSVData.pl b/LoadCSVData.pl
index 67dde3f..282d60f 100755
--- a/LoadCSVData.pl
+++ b/LoadCSVData.pl
@@ -141,7 +141,7 @@ sub matlabCalc {
         #my $args = "sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'";
 
         my $args =
-"ssh $matlab_proxy_ssh -p $matlab_proxy_ssh_port \"sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'\"";
+"ssh $matlab_proxy_ssh -p $matlab_proxy_ssh_port \"sh -c \'cd $matlab_func_dir; $cmd_elab\'\"";
 
         if ( system($args) != 0 ) {
             open( my $fh, '<', $MatlabErrorFilename )
@@ -431,7 +431,7 @@ elsif ( $filecsvname =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
     $tool     = $strings[2];
     $tooltype = 'D2W';
 }
-elsif ( $filecsvname =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
+elsif ( $filecsvname =~ m/^(\d*|)G301_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
     my @strings = $filecsvname =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
     $unittype = $strings[0];
     $unit     = $strings[1];
diff --git a/UnitCsvReceiverSmart.pl b/UnitCsvReceiverSmart.pl
index d2d9553..c83bdf2 100644
--- a/UnitCsvReceiverSmart.pl
+++ b/UnitCsvReceiverSmart.pl
@@ -59,7 +59,7 @@ sub getUnitName {    # parm => file received ($trfile)
         $unittype = $strings[0];
         $unit     = $strings[1];
     }
-    elsif ( $filenamecsv =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i ) {
+    elsif ( $filenamecsv =~ m/^(\d*|)G301_ID\d\d\d\d_DT\d\d\d\d$/i ) {
         my @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
         $unittype = $strings[0];
         $unit     = $strings[1];
@@ -107,7 +107,7 @@ while ( my $line = $tail->GetLine() ) {
                    m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d\d\d\d|GD\d\d\d\d)$/i
                 or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
                 or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i
-                or $filename =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i
+                or $filename =~ m/^(\d*|)G301_ID\d\d\d\d_DT\d\d\d\d$/i
                 or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
                 or $filename =~
                 m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i )
@@ -149,7 +149,7 @@ while ( my $line = $tail->GetLine() ) {
                         m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d.*|GD\d*)$/i
                         or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
                         or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i
-                        or $filename =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i
+                        or $filename =~ m/^(\d*|)G301_ID\d\d\d\d_DT\d\d\d\d$/i
                         or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
                         or $filename =~
                         m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i