diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
index 560cc98391..af7b5b152b 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
@@ -16,9 +16,10 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (core is NES)
 			{
-				var ss = (core as NES).GetSyncSettings();
+				var nes = core as NES;
+				var ss = nes.GetSyncSettings();
 
-				var isFds = core.BoardName == "FDS";
+				var isFds = nes.IsFDS;
 				if (ss.Controls.Famicom)
 				{
 					yield return StandardController(1);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
index d3b11d0c57..badb9a58cc 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
@@ -122,6 +122,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			get { return _isVS; }
 		}
 
+		public bool IsFDS
+		{
+			get { return Board is FDS; }
+		}
+
 		NESWatch GetWatch(NESWatch.EDomain domain, int address)
 		{
 			if (domain == NESWatch.EDomain.Sysbus)