diff --git a/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs
index 8089252955..74312601df 100644
--- a/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs
+++ b/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Hosting.Builder
     {
         public HttpContext CreateHttpContext(IFeatureCollection featureCollection)
         {
-            return new DefaultHttpContext(featureCollection);
+            return new DefaultHttpContext(new FeatureCollection(featureCollection));
         }
     }
 }
\ No newline at end of file