diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs b/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
index 1f6787eb84..7eb8d4070d 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
@@ -27,11 +27,11 @@ namespace Microsoft.AspNet.Security.DataProtection.SP800_108
         {
             if (OSVersionUtil.IsBCryptOnWin8OrLaterAvailable())
             {
-                return new Win7SP800_108_CTR_HMACSHA512Provider(pbKdk, cbKdk);
+                return new Win8SP800_108_CTR_HMACSHA512Provider(pbKdk, cbKdk);
             }
             else
             {
-                return new Win8SP800_108_CTR_HMACSHA512Provider(pbKdk, cbKdk);
+                return new Win7SP800_108_CTR_HMACSHA512Provider(pbKdk, cbKdk);
             }
         }