diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp b/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
index 03526f5e2a..4a7dfdc4d9 100644
--- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
+++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
@@ -136,7 +136,7 @@ retry:
 			}
 		};
 		fStreams[serialno] = OggStream::makeOggStream(new Interface(this, serialno), serialno, packet);
-		fCookies.push_back(fStreams[serialno]);
+		fCookies.push_back(serialno);
 	}
 	return fStreams[serialno]->AddPage(position,page);
 }
@@ -292,7 +292,7 @@ OggReader::AllocateCookie(int32 streamNumber, void **cookie)
 		TRACE("OggReader::AllocateCookie: invalid streamNumber: bail\n");
 		return B_ERROR;
 	}
-	OggStream * stream = fCookies[streamNumber];
+	OggStream * stream = fStreams[fCookies[streamNumber]];
 	// store the cookie
 	*cookie = stream;
 	return B_OK;
diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h
index fc93d34963..204ea67d4a 100644
--- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h
+++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h
@@ -11,7 +11,7 @@ namespace BPrivate { namespace media {
 class OggStream;
 
 typedef std::map<long,OggStream*> serialno_OggStream_map;
-typedef std::vector<OggStream*> OggStream_vector;
+typedef std::vector<long> serialno_vector;
 
 class OggReader : public Reader
 {
@@ -47,7 +47,7 @@ protected:
 
 	ogg_sync_state			fSync;
 	serialno_OggStream_map	fStreams;
-	OggStream_vector		fCookies;
+	serialno_vector			fCookies;
 	BPositionIO *			fSeekable;
 
 private: