diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index f399a156..582b3c95 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -1293,6 +1293,7 @@ qint64 Day::last(MachineType type)
 
 bool Day::removeSession(Session *sess)
 {
+    sess->machine()->sessionlist.remove(sess->session());
     MachineType mt = sess->type();
     bool b = sessions.removeAll(sess) > 0;
     if (!searchMachine(mt)) {
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 0cc5c3d3..6c34c123 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -1547,9 +1547,9 @@ struct OverlappingEDF {
 
 void ResDayTask::run()
 {
-    if (this->resday->date == QDate(2016,1,6)) {
-        qDebug() << "in resday" << this->resday->date;
-    }
+//    if (this->resday->date == QDate(2016,1,6)) {
+//        qDebug() << "in resday" << this->resday->date;
+//    }
     /*loader->sessionMutex.lock();
     Day *day = p_profile->FindDay(resday->date, MT_CPAP);
     if (day) {
@@ -2192,12 +2192,10 @@ int ResmedLoader::Open(const QString & dirpath)
                 // but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case
 
                 // This day was first imported as a summary from STR.edf, so we now totally want to redo this day
-                for (auto & sess : day->sessions) {
-                    if (sess->type() == MT_CPAP) {
-                        day->removeSession(sess);
-                        mach->sessionlist.remove(sess->session());
-                        delete sess;
-                    }
+                QList<Session *> sessions = day->getSessions(MT_CPAP);
+                for (auto & sess : sessions) {
+                    day->removeSession(sess);
+                    delete sess;
                 }
 
                 reimporting = true;