diff --git a/src/core/PieceTable.cc b/src/core/PieceTable.cc
index 89b56f4..440109b 100644
--- a/src/core/PieceTable.cc
+++ b/src/core/PieceTable.cc
@@ -4,7 +4,9 @@ PieceTable::PieceTable(const uint8_t * file_buffer, unsigned long file_buffer_si
 {
     m_file_buffer = file_buffer;
     m_file_buffer_size = file_buffer_size;
-    m_piece_descriptors[PIECE_DESCRIPTOR_INDEX_START].next = PIECE_DESCRIPTOR_INDEX_END;
-    m_piece_descriptors[PIECE_DESCRIPTOR_INDEX_END].prev = PIECE_DESCRIPTOR_INDEX_START;
+    start_descriptor = &m_piece_descriptors[PIECE_DESCRIPTOR_INDEX_START];
+    end_descriptor = &m_piece_descriptors[PIECE_DESCRIPTOR_INDEX_END];
+    start_descriptor->next = PIECE_DESCRIPTOR_INDEX_END;
+    end_descriptor->prev = PIECE_DESCRIPTOR_INDEX_START;
     m_piece_descriptor_index = 2u;
 }
diff --git a/src/core/PieceTable.h b/src/core/PieceTable.h
index e7dfbaf..ac4fda5 100644
--- a/src/core/PieceTable.h
+++ b/src/core/PieceTable.h
@@ -35,6 +35,9 @@ public:
         return m_piece_descriptors[m_piece_descriptor_index++];
     }
 
+    PieceDescriptor * start_descriptor;
+    PieceDescriptor * end_descriptor;
+
 protected:
     const uint8_t * m_file_buffer;
     unsigned long m_file_buffer_size;