diff --git a/us_somo/develop/src/us_hydrodyn_dad_gui.cpp b/us_somo/develop/src/us_hydrodyn_dad_gui.cpp
index ce7969b18..1ee29fad8 100644
--- a/us_somo/develop/src/us_hydrodyn_dad_gui.cpp
+++ b/us_somo/develop/src/us_hydrodyn_dad_gui.cpp
@@ -5397,7 +5397,7 @@ void US_Hydrodyn_Dad::update_enables()
    baseline_integral = ( ( US_Hydrodyn * ) us_hydrodyn )->gparams[ "dad_bl_integral" ] == "true";
 
    // pb_timeshift        ->setEnabled( files_selected_count > 0 && files_compatible && files_are_time );
-   pb_timeshift          ->setEnabled( files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
+   pb_timeshift          ->setEnabled( (int64_t)files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
    pb_timescale          ->setEnabled( files_selected_count && files_are_time && conc_selected_count == files_selected_count );
    pb_gauss_mode         ->setEnabled( files_selected_count == 1 && files_are_time );
    pb_gauss_start        ->setEnabled( files_selected_count == 1 && files_are_time );
diff --git a/us_somo/develop/src/us_hydrodyn_mals_gui.cpp b/us_somo/develop/src/us_hydrodyn_mals_gui.cpp
index 7fb2a8e2d..de726aa2e 100644
--- a/us_somo/develop/src/us_hydrodyn_mals_gui.cpp
+++ b/us_somo/develop/src/us_hydrodyn_mals_gui.cpp
@@ -4604,7 +4604,7 @@ void US_Hydrodyn_Mals::update_enables()
    baseline_integral = ( ( US_Hydrodyn * ) us_hydrodyn )->gparams[ "mals_bl_integral" ] == "true";
 
    // pb_timeshift        ->setEnabled( files_selected_count > 0 && files_compatible && files_are_time );
-   pb_timeshift          ->setEnabled( files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
+   pb_timeshift          ->setEnabled( (int64_t)files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
    pb_timescale          ->setEnabled( files_selected_count && files_are_time && conc_selected_count == files_selected_count );
    pb_gauss_mode         ->setEnabled( files_selected_count == 1 && files_are_time );
    pb_gauss_start        ->setEnabled( files_selected_count == 1 && files_are_time );
diff --git a/us_somo/develop/src/us_hydrodyn_mals_saxs_gui.cpp b/us_somo/develop/src/us_hydrodyn_mals_saxs_gui.cpp
index bfd7db41d..5f7a9ac78 100644
--- a/us_somo/develop/src/us_hydrodyn_mals_saxs_gui.cpp
+++ b/us_somo/develop/src/us_hydrodyn_mals_saxs_gui.cpp
@@ -5060,7 +5060,7 @@ void US_Hydrodyn_Mals_Saxs::update_enables()
    baseline_integral = ( ( US_Hydrodyn * ) us_hydrodyn )->gparams[ "mals_saxs_bl_integral" ] == "true";
 
    // pb_timeshift        ->setEnabled( files_selected_count > 0 && files_compatible && files_are_time );
-   pb_timeshift          ->setEnabled( files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
+   pb_timeshift          ->setEnabled( (int64_t)files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
    pb_timescale          ->setEnabled( files_selected_count && files_are_time && conc_selected_count == files_selected_count );
    pb_gauss_mode         ->setEnabled( files_selected_count == 1 && files_are_time );
    pb_gauss_start        ->setEnabled( files_selected_count == 1 && files_are_time );
diff --git a/us_somo/develop/src/us_hydrodyn_saxs_hplc_gui.cpp b/us_somo/develop/src/us_hydrodyn_saxs_hplc_gui.cpp
index 833eeede1..d7e04abba 100644
--- a/us_somo/develop/src/us_hydrodyn_saxs_hplc_gui.cpp
+++ b/us_somo/develop/src/us_hydrodyn_saxs_hplc_gui.cpp
@@ -4546,7 +4546,7 @@ void US_Hydrodyn_Saxs_Hplc::update_enables()
    baseline_integral = ( ( US_Hydrodyn * ) us_hydrodyn )->gparams[ "hplc_bl_integral" ] == "true";
 
    // pb_timeshift        ->setEnabled( files_selected_count > 0 && files_compatible && files_are_time );
-   pb_timeshift          ->setEnabled( files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
+   pb_timeshift          ->setEnabled( (int64_t)files_selected_count - conc_selected_count > 0 && files_compatible && files_are_time && conc_files.size() );
    pb_timescale          ->setEnabled( files_selected_count && files_are_time && conc_selected_count == files_selected_count );
    pb_gauss_mode         ->setEnabled( files_selected_count == 1 && files_are_time );
    pb_gauss_start        ->setEnabled( files_selected_count == 1 && files_are_time );