diff --git a/ChangeLog b/ChangeLog
index 1d099ca6992646e8c123df6b39a69dec83ad0682..871d31d53615cb177e7d0d6ce1e248a4b4e36873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-13  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
+TAG v2.0.7
+* src/PartOfPacket.cpp (PartOfPacket::setByteStream): 
+	 For some reasons the following line introduced with v2.0.6:
+	 222: this->stream->setStream(s, 0, s->getDimension() - 1);
+	 does not work on linux (but only on make). Restored the old version
+	 221: this->stream = s;
+
 2013-09-12  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
 TAG v2.0.6
 
diff --git a/src/PartOfPacket.cpp b/src/PartOfPacket.cpp
index 19bfe1f701bde9c1aba2a5f809a57a9390613245..0a8f69a6cab1fcdeffe144a61f24bf9e9aa51ff0 100644
--- a/src/PartOfPacket.cpp
+++ b/src/PartOfPacket.cpp
@@ -218,8 +218,8 @@ bool PartOfPacket::setByteStream(ByteStream* s)
         stream->setStream(s->stream, s->getDimension(), s->isBigendian());
 
     /// The stream is assigned
-    //this->stream = s;
-    this->stream->setStream(s, 0, s->getDimension() - 1);
+    this->stream = s;
+    //this->stream->setStream(s, 0, s->getDimension() - 1);
     /// The pointer is converted from byte to void. The reading from file allows the correct data interpretation
     /// for big or little endian machines
     byte* stream = (byte*) s->stream;
diff --git a/version b/version
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8c3e788c8c7825c52b63d37a4805ecd24de17542 100644
--- a/version
+++ b/version
@@ -0,0 +1 @@
+2.0.1