diff --git a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
index 98d8943b..c34e9710 100644
--- a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
@@ -1,4 +1,4 @@
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
diff --git a/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
index 86df0649..e1968d51 100644
--- a/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
@@ -1,4 +1,4 @@
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
diff --git a/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
index e13e0db3..9c7bab69 100644
--- a/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/kookaburra/config/hmm/hmm_configuration.tcl
@@ -1,7 +1,7 @@
 # Author Jing Chen (jgn@ansto.gove.au)
 
 
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
diff --git a/site_ansto/instrument/lyrebird/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/lyrebird/config/hmm/hmm_configuration.tcl
index 305dec01..c0a95646 100644
--- a/site_ansto/instrument/lyrebird/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/lyrebird/config/hmm/hmm_configuration.tcl
@@ -1,7 +1,7 @@
 # Author Jing Chen (jgn@ansto.gove.au)
 
 
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
diff --git a/site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl
index fba129c1..2a89ce05 100644
--- a/site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl
@@ -1,7 +1,7 @@
 # Author Jing Chen (jgn@ansto.gove.au)
 
 
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
diff --git a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
index 7bbe9d27..ad22fc1c 100644
--- a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
@@ -1,4 +1,4 @@
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
 proc ::histogram_memory::init_OAT_TABLE {} {
diff --git a/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
index c9028418..7b0bbc12 100644
--- a/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
@@ -1,5 +1,5 @@
 
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 ::utility::mkVar sample_to_detector_distance float manager sample_to_detector_distance true detector true true
 sicslist setatt sample_to_detector_distance units mm
diff --git a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
index dbd4b87c..f13b11d2 100644
--- a/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
@@ -1,5 +1,5 @@
 
-source $cfPath(hmm)/hmm_configuration_common_1.tcl
+fileeval $cfPath(hmm)/hmm_configuration_common_1.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
 proc ::histogram_memory::init_OAT_TABLE {} {