diff --git a/src/NotesLoaderJson.cpp b/src/NotesLoaderJson.cpp
index 4ebf450c59..3727b7a53c 100644
--- a/src/NotesLoaderJson.cpp
+++ b/src/NotesLoaderJson.cpp
@@ -15,16 +15,16 @@ void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString>
 	GetDirListing( sPath + RString("*.json"), out );
 }
 
-static void Deserialize(TimingSegment *seg, const Json::Value &root)
+static void Deserialize(TimingSegment &seg, const Json::Value &root)
 {
-	seg->SetBeat((float)(root["Beat"].asDouble()));
-	if (seg->GetType() == SEGMENT_BPM)
+	(&seg)->SetBeat((float)(root["Beat"].asDouble()));
+	if ((&seg)->GetType() == SEGMENT_BPM)
 	{
-		static_cast<BPMSegment *>(seg)->SetBPM((float)(root["BPM"].asDouble()));
+		static_cast<BPMSegment *>(&seg)->SetBPM((float)(root["BPM"].asDouble()));
 	}
 	else
 	{
-		static_cast<StopSegment *>(seg)->SetPause((float)(root["Seconds"].asDouble()));
+		static_cast<StopSegment *>(&seg)->SetPause((float)(root["Seconds"].asDouble()));
 	}
 }
 
diff --git a/src/NotesWriterJson.cpp b/src/NotesWriterJson.cpp
index f4ef393da6..26cc3a28b3 100644
--- a/src/NotesWriterJson.cpp
+++ b/src/NotesWriterJson.cpp
@@ -9,16 +9,16 @@
 #include "NoteData.h"
 #include "GameManager.h"
 
-static void Serialize(const TimingSegment *seg, Json::Value &root)
+static void Serialize(const TimingSegment &seg, Json::Value &root)
 {
-	root["Beat"] = seg->GetBeat();
-	if (seg->GetType() == SEGMENT_BPM)
+	root["Beat"] = (&seg)->GetBeat();
+	if ((&seg)->GetType() == SEGMENT_BPM)
 	{
-		root["BPM"] = static_cast<BPMSegment *>(const_cast<TimingSegment *>(seg))->GetBPM();
+		root["BPM"] = static_cast<BPMSegment *>(const_cast<TimingSegment *>(&seg))->GetBPM();
 	}
 	else
 	{
-		root["Seconds"] = static_cast<StopSegment *>(const_cast<TimingSegment *>(seg))->GetPause();
+		root["Seconds"] = static_cast<StopSegment *>(const_cast<TimingSegment *>(&seg))->GetPause();
 	}
 }