diff --git a/inst/cta/src/GCTACubeBackground.cpp b/inst/cta/src/GCTACubeBackground.cpp
index b711428..c3dc7cc 100644
--- a/inst/cta/src/GCTACubeBackground.cpp
+++ b/inst/cta/src/GCTACubeBackground.cpp
@@ -299,8 +299,8 @@ void GCTACubeBackground::fill(const GObservations& obs, GLog* log)
             continue;
         }
 
-        // Skip observation if we don't have an unbinned observation
-        if (cta->eventtype() != "EventList") {
+        // Skip observation if we have a binned observation
+        if (obs->eventtype() == "CountsCube") {
             if (log != NULL) {
                 *log << "Warning: Skipping binned observation ";
                 *log << "\"" << cta->name() << "\"" <<std::endl;
diff --git a/inst/cta/src/GCTACubeExposure.cpp b/inst/cta/src/GCTACubeExposure.cpp
index e1aa388..bd656e4 100644
--- a/inst/cta/src/GCTACubeExposure.cpp
+++ b/inst/cta/src/GCTACubeExposure.cpp
@@ -395,8 +395,8 @@ void GCTACubeExposure::fill(const GObservations& obs, GLog* log)
             continue;
         }
 
-        // Skip observation if we don't have an unbinned observation
-        if (cta->eventtype() != "EventList") {
+        // Skip observation if we have a binned observation
+        if (obs->eventtype() == "CountsCube") {
             if (log != NULL) {
                 *log << "Warning: Skipping binned observation ";
                 *log << "\"" << cta->name() << "\"" <<std::endl;
diff --git a/inst/cta/src/GCTACubePsf.cpp b/inst/cta/src/GCTACubePsf.cpp
index dcaa9b4..342e965 100644
--- a/inst/cta/src/GCTACubePsf.cpp
+++ b/inst/cta/src/GCTACubePsf.cpp
@@ -460,8 +460,8 @@ void GCTACubePsf::fill(const GObservations& obs, GLog* log)
             continue;
         }
 
-        // Skip observation if we don't have an unbinned observation
-        if (cta->eventtype() != "EventList") {
+        // Skip observation if we have a binned observation
+        if (obs->eventtype() == "CountsCube") {
             if (log != NULL) {
                 *log << "Warning: Skipping binned observation ";
                 *log << "\"" << cta->name() << "\"" <<std::endl;