diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua
index 09fab5ed..2d6a41bd 100644
--- a/src/actions/vstudio/vs2010_vcxproj.lua
+++ b/src/actions/vstudio/vs2010_vcxproj.lua
@@ -1181,7 +1181,7 @@
 	function m.debugInformationFormat(cfg)
 		local value
 		local tool, toolVersion = p.config.toolset(cfg)
-		if cfg.symbols == p.ON then
+		if (cfg.symbols == p.ON) or (cfg.symbols == "FastLink") then
 			if cfg.debugformat == "c7" then
 				value = "OldStyle"
 			elseif (cfg.architecture == "x86_64" and _ACTION < "vs2015") or
diff --git a/tests/actions/vstudio/vc2010/test_compile_settings.lua b/tests/actions/vstudio/vc2010/test_compile_settings.lua
index c6f1b568..ff9b4cd7 100644
--- a/tests/actions/vstudio/vc2010/test_compile_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_compile_settings.lua
@@ -621,6 +621,22 @@
 		]]
 	end
 
+--
+-- Check the handling of the editandcontinue flag.
+--
+
+	function suite.debugFormat_onFastLinkBuild()
+		symbols "FastLink"
+		editandcontinue "Off"
+		prepare()
+		test.capture [[
+<ClCompile>
+	<PrecompiledHeader>NotUsing</PrecompiledHeader>
+	<WarningLevel>Level3</WarningLevel>
+	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		]]
+	end
+
 
 --
 -- Edit-and-Continue is not supported for optimized builds.
@@ -639,6 +655,7 @@
 	end
 
 
+
 --
 -- Edit-and-Continue is not supported for Managed builds.
 --