2 files changed, 5 insertions, 4 deletions
diff --git a/src/common/io/MemoryStream.cpp b/src/common/io/MemoryStream.cpp
index 481ed962..dcb7a032 100644
--- a/src/common/io/MemoryStream.cpp
+++ b/src/common/io/MemoryStream.cpp
@@ -9,9 +9,7 @@ MemoryStream::~MemoryStream() {
 
 bool MemoryStream::CanSeek() { return true; }
 
-Index MemoryStream::Tell() { return position_; }
-
-void MemoryStream::Seek(Index offset, SeekOrigin origin) {
+Index MemoryStream::Seek(Index offset, SeekOrigin origin) {
   switch (origin) {
     case SeekOrigin::Current:
       position_ += offset;
@@ -23,6 +21,7 @@ void MemoryStream::Seek(Index offset, SeekOrigin origin) {
       position_ = size_ + offset;
       break;
   }
+  return position_;
 }
 
 bool MemoryStream::CanRead() { return true; }
diff --git a/src/common/io/Stream.cpp b/src/common/io/Stream.cpp
index 4f2953f9..ad1dbd0e 100644
--- a/src/common/io/Stream.cpp
+++ b/src/common/io/Stream.cpp
@@ -1,7 +1,9 @@
 #include "cru/common/io/Stream.hpp"
 
 namespace cru::io {
-void Stream::Rewind() { Seek(0); }
+Index Stream::Tell() { return Seek(0, SeekOrigin::Current); }
+
+void Stream::Rewind() { Seek(0, SeekOrigin::Begin); }
 
 Index Stream::GetSize() {
   Index current_position = Tell();