diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index e122f54d..cd429698 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -27,6 +27,8 @@
       <li>[fix] Improve language in various error messages.</li>
       <li>[fix] Date at right end of Overview page reflects actual data, not any future notes.</li>
       <li>[fix] Limit SD card scan to mounted vfat volumes.</li>
+      <li>[fix] Correct Statistics page calculations when CPAP and Oximetry use do not overlap.</li>
+      <li>[fix] Hours used on Welcome and Daily page are now hours of CPAP machine use.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.1.1</b>
diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index d767ba9a..41c40323 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -1342,7 +1342,7 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
         Day *day = GetGoodDay(date, mt);
 
         if (day) {
-            val += day->hours();
+            val += day->hours(mt);
         }
 
         date = date.addDays(1);
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index f118a96e..6048b5ce 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -1431,7 +1431,7 @@ QString Daily::getSleepTime(Day * day)
 
     html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
     html+="<tr><td align='center'><b>"+STR_TR_Date+"</b></td><td align='center'><b>"+tr("Start")+"</b></td><td align='center'><b>"+tr("End")+"</b></td><td align='center'><b>"+STR_UNIT_Hours+"</b></td></tr>";
-    int tt=qint64(day->total_time())/1000L;
+    int tt=qint64(day->total_time(MT_CPAP))/1000L;
     QDateTime date=QDateTime::fromTime_t(day->first()/1000L);
     QDateTime date2=QDateTime::fromTime_t(day->last()/1000L);
 
diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index bf797f81..93a5c2ee 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -183,7 +183,7 @@ QString Welcome::GenerateCPAPHTML()
 
             html += tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + "<br/>";
 
-            EventDataType hours = day->hours();
+            EventDataType hours = day->hours(MT_CPAP);
             html += "<br/>";
 
             int seconds = int(hours * 3600.0) % 60;