diff --git a/etc/bashrc b/etc/bashrc
index 2f76281083f661b04bb686dc8c69e4318893521f..aa26e57dbee01a7caf9f418274f21d1742b46411 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -178,7 +178,11 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
+
+if [ ! -z "$FOAMY_HEX_MESH" ]
+then
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
+fi
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/cshrc b/etc/cshrc
index 3390248980ab6411e46c61baf69a213e9a9ad6e0..249c50afb446d6720b152a61122e8618b79e250a 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -210,7 +210,10 @@ _foamSource $WM_PROJECT_DIR/etc/config.csh/aliases
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
+
+if ( ($?FOAMY_HEX_MESH) ) then
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
+endif
 
 
 # Clean environment paths again. Only remove duplicates
@@ -233,6 +236,7 @@ if ( $?LD_PRELOAD ) then
     if ( $status == 0 ) setenv LD_PRELOAD $cleaned
 endif
 
+
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 unset cleaned foamClean foamInstall foamOldDirs