diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 4f81d934df..f092aa8d84 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -2867,9 +2867,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 			if( (*s)->IsAutogen() )
 				continue;
 			// If the notedata has content, let it go.
-			NoteData tmp;
-			(*s)->GetNoteData(tmp);
-			if( !tmp.IsEmpty() )
+			if( !(*s)->GetNoteData().IsEmpty() )
 				continue;
 			// It's hard to say if these steps were saved to disk or not.
 			/*
diff --git a/src/Steps.cpp b/src/Steps.cpp
index 9110ecf96d..5fcddbfd27 100644
--- a/src/Steps.cpp
+++ b/src/Steps.cpp
@@ -89,6 +89,13 @@ void Steps::GetNoteData( NoteData& noteDataOut ) const
 	}
 }
 
+NoteData Steps::GetNoteData() const
+{
+	NoteData tmp;
+	this->GetNoteData( tmp );
+	return tmp;
+}
+
 void Steps::SetSMNoteData( const RString &notes_comp_ )
 {
 	m_pNoteData->Init();
diff --git a/src/Steps.h b/src/Steps.h
index e42c11d54d..fee6204527 100644
--- a/src/Steps.h
+++ b/src/Steps.h
@@ -108,6 +108,7 @@ public:
 
 	unsigned GetHash() const;
 	void GetNoteData( NoteData& noteDataOut ) const;
+	NoteData GetNoteData() const;
 	void SetNoteData( const NoteData& noteDataNew );
 	void SetSMNoteData( const RString &notes_comp );
 	void GetSMNoteData( RString &notes_comp_out ) const;