diff --git a/src/Organya.cpp b/src/Organya.cpp
index 31cc0894..58eab289 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -455,7 +455,11 @@ BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
 		for (i = 0; i < MAXMELODY; i++)
 		{
 			info.tdata[i].freq = mi->tdata[i].freq;
-			info.tdata[i].pipi = info.tdata[i].pipi;	// info.tdata[i].pipi is assigned to itself. Thanks, Pixel. (Most likely, the original code wasn't written the exact same way)
+		#ifdef FIX_BUGS
+			info.tdata[i].pipi = mi->tdata[i].pipi;
+		#else
+			info.tdata[i].pipi = info.tdata[i].pipi;	 // Just sets info.tdata[i].pipi to itself
+		#endif
 		}
 	}
 
@@ -488,11 +492,11 @@ BOOL OrgData::NoteAlloc(unsigned short alloc)
 				if (info.tdata[i].note_p != NULL)
 				{
 					free(info.tdata[i].note_p);
-#ifdef FIX_BUGS
+				#ifdef FIX_BUGS
 					info.tdata[i].note_p = NULL;
-#else
+				#else
 					info.tdata[j].note_p = NULL;	// Uses j instead of i
-#endif
+				#endif
 				}
 			}