diff --git a/crpptbx/gdat.m b/crpptbx/gdat.m
index 7566bbe40cddb9e87b399a2a9156a214dc61dbe1..2896af794d79ef0354fb1f659ddf016be0d2ef3f 100644
--- a/crpptbx/gdat.m
+++ b/crpptbx/gdat.m
@@ -78,11 +78,12 @@ if nargin>2
 end
 
 fusion_machine_defaultname=getenv('FUSION_MACHINE_DEFAULTNAME');
-default_machine = '';
+default_machine = 'tcv';
 if ~isempty(fusion_machine_defaultname)
   default_machine = lower(fusion_machine_defaultname);
 else
-  hostname=getenv('HOSTNAME');
+  [s,hostname]=unix('hostname -a');
+  if s || isempty(hostname), hostname=getenv('HOSTNAME');end
   if ~isempty(regexpi(hostname,'epfl'))
     default_machine = 'tcv';
   elseif ~isempty(regexpi(hostname,'rzg.mpg'))