diff --git a/Part #3 - Buses, Rams, Roms & Mappers/olc6502.cpp b/Part #3 - Buses, Rams, Roms & Mappers/olc6502.cpp
index 0570036..2ebcb4b 100644
--- a/Part #3 - Buses, Rams, Roms & Mappers/olc6502.cpp	
+++ b/Part #3 - Buses, Rams, Roms & Mappers/olc6502.cpp	
@@ -68,7 +68,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, ©OneLoneCoder 2019
+	David Barr, aka javidx9, �OneLoneCoder 2019
 */
 
 #include "olc6502.h"
@@ -208,10 +208,13 @@ void olc6502::irq()
 		// Then Push the status register to the stack
 		SetFlag(B, 0);
 		SetFlag(U, 1);
-		SetFlag(I, 1);
 		write(0x0100 + stkp, status);
 		stkp--;
 
+		// After writing to the stack, set the Interupt flag to 1
+		// to prevent other interrupts
+		SetFlag(I, 1);
+
 		// Read new program counter location from fixed address
 		addr_abs = 0xFFFE;
 		uint16_t lo = read(addr_abs + 0);
@@ -236,10 +239,13 @@ void olc6502::nmi()
 
 	SetFlag(B, 0);
 	SetFlag(U, 1);
-	SetFlag(I, 1);
 	write(0x0100 + stkp, status);
 	stkp--;
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	addr_abs = 0xFFFA;
 	uint16_t lo = read(addr_abs + 0);
 	uint16_t hi = read(addr_abs + 1);
@@ -894,7 +900,6 @@ uint8_t olc6502::BRK()
 {
 	pc++;
 	
-	SetFlag(I, 1);
 	write(0x0100 + stkp, (pc >> 8) & 0x00FF);
 	stkp--;
 	write(0x0100 + stkp, pc & 0x00FF);
@@ -905,6 +910,10 @@ uint8_t olc6502::BRK()
 	stkp--;
 	SetFlag(B, 0);
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	pc = (uint16_t)read(0xFFFE) | ((uint16_t)read(0xFFFF) << 8);
 	return 0;
 }
diff --git a/Part #4 - PPU Backgrounds/olc6502.cpp b/Part #4 - PPU Backgrounds/olc6502.cpp
index 0570036..2ebcb4b 100644
--- a/Part #4 - PPU Backgrounds/olc6502.cpp	
+++ b/Part #4 - PPU Backgrounds/olc6502.cpp	
@@ -68,7 +68,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, ©OneLoneCoder 2019
+	David Barr, aka javidx9, �OneLoneCoder 2019
 */
 
 #include "olc6502.h"
@@ -208,10 +208,13 @@ void olc6502::irq()
 		// Then Push the status register to the stack
 		SetFlag(B, 0);
 		SetFlag(U, 1);
-		SetFlag(I, 1);
 		write(0x0100 + stkp, status);
 		stkp--;
 
+		// After writing to the stack, set the Interupt flag to 1
+		// to prevent other interrupts
+		SetFlag(I, 1);
+
 		// Read new program counter location from fixed address
 		addr_abs = 0xFFFE;
 		uint16_t lo = read(addr_abs + 0);
@@ -236,10 +239,13 @@ void olc6502::nmi()
 
 	SetFlag(B, 0);
 	SetFlag(U, 1);
-	SetFlag(I, 1);
 	write(0x0100 + stkp, status);
 	stkp--;
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	addr_abs = 0xFFFA;
 	uint16_t lo = read(addr_abs + 0);
 	uint16_t hi = read(addr_abs + 1);
@@ -894,7 +900,6 @@ uint8_t olc6502::BRK()
 {
 	pc++;
 	
-	SetFlag(I, 1);
 	write(0x0100 + stkp, (pc >> 8) & 0x00FF);
 	stkp--;
 	write(0x0100 + stkp, pc & 0x00FF);
@@ -905,6 +910,10 @@ uint8_t olc6502::BRK()
 	stkp--;
 	SetFlag(B, 0);
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	pc = (uint16_t)read(0xFFFE) | ((uint16_t)read(0xFFFF) << 8);
 	return 0;
 }
diff --git a/Part #5 - PPU Foregrounds/olc6502.cpp b/Part #5 - PPU Foregrounds/olc6502.cpp
index 0570036..2ebcb4b 100644
--- a/Part #5 - PPU Foregrounds/olc6502.cpp	
+++ b/Part #5 - PPU Foregrounds/olc6502.cpp	
@@ -68,7 +68,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, ©OneLoneCoder 2019
+	David Barr, aka javidx9, �OneLoneCoder 2019
 */
 
 #include "olc6502.h"
@@ -208,10 +208,13 @@ void olc6502::irq()
 		// Then Push the status register to the stack
 		SetFlag(B, 0);
 		SetFlag(U, 1);
-		SetFlag(I, 1);
 		write(0x0100 + stkp, status);
 		stkp--;
 
+		// After writing to the stack, set the Interupt flag to 1
+		// to prevent other interrupts
+		SetFlag(I, 1);
+
 		// Read new program counter location from fixed address
 		addr_abs = 0xFFFE;
 		uint16_t lo = read(addr_abs + 0);
@@ -236,10 +239,13 @@ void olc6502::nmi()
 
 	SetFlag(B, 0);
 	SetFlag(U, 1);
-	SetFlag(I, 1);
 	write(0x0100 + stkp, status);
 	stkp--;
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	addr_abs = 0xFFFA;
 	uint16_t lo = read(addr_abs + 0);
 	uint16_t hi = read(addr_abs + 1);
@@ -894,7 +900,6 @@ uint8_t olc6502::BRK()
 {
 	pc++;
 	
-	SetFlag(I, 1);
 	write(0x0100 + stkp, (pc >> 8) & 0x00FF);
 	stkp--;
 	write(0x0100 + stkp, pc & 0x00FF);
@@ -905,6 +910,10 @@ uint8_t olc6502::BRK()
 	stkp--;
 	SetFlag(B, 0);
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	pc = (uint16_t)read(0xFFFE) | ((uint16_t)read(0xFFFF) << 8);
 	return 0;
 }
diff --git a/Part #7 - Mappers & Basic Sounds/olc6502.cpp b/Part #7 - Mappers & Basic Sounds/olc6502.cpp
index 0570036..2ebcb4b 100644
--- a/Part #7 - Mappers & Basic Sounds/olc6502.cpp	
+++ b/Part #7 - Mappers & Basic Sounds/olc6502.cpp	
@@ -68,7 +68,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, ©OneLoneCoder 2019
+	David Barr, aka javidx9, �OneLoneCoder 2019
 */
 
 #include "olc6502.h"
@@ -208,10 +208,13 @@ void olc6502::irq()
 		// Then Push the status register to the stack
 		SetFlag(B, 0);
 		SetFlag(U, 1);
-		SetFlag(I, 1);
 		write(0x0100 + stkp, status);
 		stkp--;
 
+		// After writing to the stack, set the Interupt flag to 1
+		// to prevent other interrupts
+		SetFlag(I, 1);
+
 		// Read new program counter location from fixed address
 		addr_abs = 0xFFFE;
 		uint16_t lo = read(addr_abs + 0);
@@ -236,10 +239,13 @@ void olc6502::nmi()
 
 	SetFlag(B, 0);
 	SetFlag(U, 1);
-	SetFlag(I, 1);
 	write(0x0100 + stkp, status);
 	stkp--;
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	addr_abs = 0xFFFA;
 	uint16_t lo = read(addr_abs + 0);
 	uint16_t hi = read(addr_abs + 1);
@@ -894,7 +900,6 @@ uint8_t olc6502::BRK()
 {
 	pc++;
 	
-	SetFlag(I, 1);
 	write(0x0100 + stkp, (pc >> 8) & 0x00FF);
 	stkp--;
 	write(0x0100 + stkp, pc & 0x00FF);
@@ -905,6 +910,10 @@ uint8_t olc6502::BRK()
 	stkp--;
 	SetFlag(B, 0);
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	pc = (uint16_t)read(0xFFFE) | ((uint16_t)read(0xFFFF) << 8);
 	return 0;
 }
diff --git a/Part#2 - CPU/olc6502.cpp b/Part#2 - CPU/olc6502.cpp
index d3db41c..a6870f7 100644
--- a/Part#2 - CPU/olc6502.cpp	
+++ b/Part#2 - CPU/olc6502.cpp	
@@ -208,10 +208,13 @@ void olc6502::irq()
 		// Then Push the status register to the stack
 		SetFlag(B, 0);
 		SetFlag(U, 1);
-		SetFlag(I, 1);
 		write(0x0100 + stkp, status);
 		stkp--;
 
+		// After writing to the stack, set the Interupt flag to 1
+		// to prevent other interrupts
+		SetFlag(I, 1);
+
 		// Read new program counter location from fixed address
 		addr_abs = 0xFFFE;
 		uint16_t lo = read(addr_abs + 0);
@@ -236,10 +239,13 @@ void olc6502::nmi()
 
 	SetFlag(B, 0);
 	SetFlag(U, 1);
-	SetFlag(I, 1);
 	write(0x0100 + stkp, status);
 	stkp--;
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	addr_abs = 0xFFFA;
 	uint16_t lo = read(addr_abs + 0);
 	uint16_t hi = read(addr_abs + 1);
@@ -894,7 +900,6 @@ uint8_t olc6502::BRK()
 {
 	pc++;
 	
-	SetFlag(I, 1);
 	write(0x0100 + stkp, (pc >> 8) & 0x00FF);
 	stkp--;
 	write(0x0100 + stkp, pc & 0x00FF);
@@ -905,6 +910,10 @@ uint8_t olc6502::BRK()
 	stkp--;
 	SetFlag(B, 0);
 
+	// After writing to the stack, set the Interupt flag to 1
+	// to prevent other interrupts
+	SetFlag(I, 1);
+
 	pc = (uint16_t)read(0xFFFE) | ((uint16_t)read(0xFFFF) << 8);
 	return 0;
 }