diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index cd9e31d0..0c5a5fb2 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -97,19 +97,17 @@ void MxDiskStreamController::FUN_100c7980()
 MxDSStreamingAction* MxDiskStreamController::VTable0x28()
 {
 	MxAutoLocker lock(&this->m_criticalSection);
+	MxDSAction* oldAction;
 	MxDSStreamingAction* result = NULL;
 	MxU32 filesize = m_provider->GetFileSize();
 
-	if (m_unk0x3c.size() != 0) {
-		MxDSStreamingAction* oldAction = (MxDSStreamingAction*) m_unk0x3c.front();
-		m_unk0x3c.pop_front();
-
-		MxDSStreamingAction* action = new MxDSStreamingAction(*oldAction);
-		result = action;
-		if (action) {
-			oldAction->SetUnknown94(action->GetBufferOffset() + filesize);
-			oldAction->SetBufferOffset(action->GetBufferOffset() + filesize);
-			m_unk0x3c.push_back(action);
+	if (m_unk0x3c.PopFront(oldAction)) {
+		result = new MxDSStreamingAction((MxDSStreamingAction&) *oldAction);
+		if (result) {
+			MxU32 offset = result->GetBufferOffset() + filesize;
+			((MxDSStreamingAction*) oldAction)->SetUnknown94(offset);
+			((MxDSStreamingAction*) oldAction)->SetBufferOffset(offset);
+			m_unk0x3c.push_back(result);
 		}
 	}
 
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index 2a9e7351..abe48779 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -13,6 +13,18 @@ class MxStreamList : public list<T> {};
 class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 public:
 	MxDSAction* Find(MxDSAction* p_action, MxBool p_delete);
+
+	// Could move this to MxStreamList
+	MxBool PopFront(MxDSAction*& p_obj)
+	{
+		if (!empty()) {
+			p_obj = front();
+			pop_front();
+			return TRUE;
+		}
+
+		return FALSE;
+	}
 };
 
 // SIZE 0xc