diff --git a/Device/IO/ReadWriteTiff.cpp b/Device/IO/ReadWriteTiff.cpp
index 3798f07e71ea55dad4c1ef21de6836a83e7c96f9..599e3adaa69a1111debf7d9327102b2f14602e4a 100644
--- a/Device/IO/ReadWriteTiff.cpp
+++ b/Device/IO/ReadWriteTiff.cpp
@@ -183,7 +183,8 @@ void ReadWriteTiff::read_data()
     if (!buf)
         throw std::runtime_error("Cannot read TIFF file: failed allocating buffer");
 
-    create_output_data();
+    m_data.reset(new Datafield({newEquiDivision("x", m_width, 0.0, double(m_width)),
+                                newEquiDivision("y", m_height, 0.0, double(m_height))}));
 
     std::vector<int8_t> line_buf;
     line_buf.resize(buf_size, 0);
@@ -254,11 +255,4 @@ void ReadWriteTiff::close()
     }
 }
 
-void ReadWriteTiff::create_output_data()
-{
-    ASSERT(m_tiff);
-    m_data.reset(new Datafield({newEquiDivision("x", m_width, 0.0, double(m_width)),
-                                newEquiDivision("y", m_height, 0.0, double(m_height))}));
-}
-
 #endif // BA_TIFF_SUPPORT
diff --git a/Device/IO/ReadWriteTiff.h b/Device/IO/ReadWriteTiff.h
index 5ce2f82608ea59addf73e58dcd11a003019aa98b..0bb1a165d6699f7698b6050ff87f4567c9f1d564 100644
--- a/Device/IO/ReadWriteTiff.h
+++ b/Device/IO/ReadWriteTiff.h
@@ -43,7 +43,6 @@ private:
     void read_header();
     void read_data();
     void close();
-    void create_output_data();
 
     TIFF* m_tiff;
     size_t m_width, m_height;