diff --git a/src/blockstore/implementations/ondisk/OnDiskBlock.cpp b/src/blockstore/implementations/ondisk/OnDiskBlock.cpp
index cb78e4b3..36dbd390 100644
--- a/src/blockstore/implementations/ondisk/OnDiskBlock.cpp
+++ b/src/blockstore/implementations/ondisk/OnDiskBlock.cpp
@@ -112,7 +112,8 @@ optional<Data> OnDiskBlock::_loadFromDisk(const bf::path &filepath) {
   }
   _checkHeader(&file);
   Data result = Data::LoadFromStream(file);
-  return result;
+  //TODO With newer compilers, "return result;" would be enough
+  return boost::optional<Data>(std::move(result));
 }
 
 void OnDiskBlock::_checkHeader(istream *str) {