diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css
index d2b096e3..0a8ecabf 100644
--- a/cara/apps/calculator/static/css/report.css
+++ b/cara/apps/calculator/static/css/report.css
@@ -144,6 +144,12 @@ p.notes {
         padding: 15px; 
         page-break-inside: avoid;
     }
+    #button_full_exposure {
+        display: none!important;
+    }
+    #button_long_exposure {
+        display: none!important;
+    }
 }
 
 
diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index addafd98..d94cb973 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -528,8 +528,14 @@ function overlapped_times(obj, start_time, finish_time) {
   
   let simulation_start = parseTimeToMins($("#exposed_start").val())
   let simulation_finish = parseTimeToMins($("#exposed_finish").val())
-  let simulation_lunch_start = parseTimeToMins($("#exposed_lunch_start").val())
-  let simulation_lunch_finish = parseTimeToMins($("#exposed_lunch_finish").val())
+  var simulation_lunch_start, simulation_lunch_finish;
+  if ($('input[name=exposed_lunch_option]:checked').val() == 1) {
+    simulation_lunch_start = parseTimeToMins($("#exposed_lunch_start").val())
+    simulation_lunch_finish = parseTimeToMins($("#exposed_lunch_finish").val())
+  } else {
+    simulation_lunch_start = 0
+    simulation_lunch_finish = 0
+  }
   if (start_time < simulation_start || start_time > simulation_finish  ||
     finish_time < simulation_start || finish_time > simulation_finish ||
     start_time >= simulation_lunch_start && start_time <= simulation_lunch_finish ||