diff --git a/src/streams/HashedBlockStream.cpp b/src/streams/HashedBlockStream.cpp
index ba4a563ce..c0f97764a 100644
--- a/src/streams/HashedBlockStream.cpp
+++ b/src/streams/HashedBlockStream.cpp
@@ -40,6 +40,7 @@ HashedBlockStream::HashedBlockStream(QIODevice* baseDevice, qint32 blockSize)
 
 void HashedBlockStream::init()
 {
+    m_buffer.clear();
     m_bufferPos = 0;
     m_blockIndex = 0;
     m_eof = false;
@@ -62,7 +63,6 @@ bool HashedBlockStream::reset()
     }
 
     init();
-    m_buffer.clear();
 
     return true;
 }
diff --git a/src/streams/SymmetricCipherStream.cpp b/src/streams/SymmetricCipherStream.cpp
index be3536331..fd7354727 100644
--- a/src/streams/SymmetricCipherStream.cpp
+++ b/src/streams/SymmetricCipherStream.cpp
@@ -17,8 +17,9 @@
 
 #include "SymmetricCipherStream.h"
 
-SymmetricCipherStream::SymmetricCipherStream(QIODevice* baseDevice, SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode,
-                      SymmetricCipher::Direction direction, const QByteArray& key, const QByteArray& iv)
+SymmetricCipherStream::SymmetricCipherStream(QIODevice* baseDevice, SymmetricCipher::Algorithm algo,
+                                             SymmetricCipher::Mode mode, SymmetricCipher::Direction direction,
+                                             const QByteArray& key, const QByteArray& iv)
                           : LayeredStream(baseDevice)
                           , m_bufferPos(0)
                           , m_bufferFilling(false)