diff --git a/src/HtmlAgilityPack.NETStandard1_3/HtmlAgilityPack.NETStandard1_3.csproj b/src/HtmlAgilityPack.NETStandard1_3/HtmlAgilityPack.NETStandard1_3.csproj
index 9b8c290b..e1d8922c 100644
--- a/src/HtmlAgilityPack.NETStandard1_3/HtmlAgilityPack.NETStandard1_3.csproj
+++ b/src/HtmlAgilityPack.NETStandard1_3/HtmlAgilityPack.NETStandard1_3.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <PackageId>HtmlAgilityPack</PackageId>
-    <Version>1.11.1</Version>
+    <Version>1.11.24</Version>
     <Authors>ZZZ Projects Inc.</Authors>
     <Company>ZZZ Projects Inc.</Company>
     <Product>Html Agility Pack</Product>
@@ -35,9 +35,6 @@
   <Import Project="..\HtmlAgilityPack.Shared\HtmlAgilityPack.Shared.projitems" Label="Shared" />
 
   <ItemGroup>
-    <PackageReference Include="System.Net.Http" Version="4.3.1" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/HtmlAgilityPack.NETStandard2_0/HtmlAgilityPack.NETStandard2_0.csproj b/src/HtmlAgilityPack.NETStandard2_0/HtmlAgilityPack.NETStandard2_0.csproj
index beffe1f6..9949d13f 100644
--- a/src/HtmlAgilityPack.NETStandard2_0/HtmlAgilityPack.NETStandard2_0.csproj
+++ b/src/HtmlAgilityPack.NETStandard2_0/HtmlAgilityPack.NETStandard2_0.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>HtmlAgilityPack</AssemblyName>
     <RootNamespace>HtmlAgilityPack</RootNamespace>
     <PackageId>HtmlAgilityPack</PackageId>
-    <Version>1.11.1</Version>
+    <Version>1.11.24</Version>
     <Authors>ZZZ Projects Inc.</Authors>
     <Company>ZZZ Projects Inc.</Company>
     <Product>Html Agility Pack</Product>
diff --git a/src/HtmlAgilityPack.NetStandard1_6/HtmlAgilityPack.NetStandard1_6.csproj b/src/HtmlAgilityPack.NetStandard1_6/HtmlAgilityPack.NetStandard1_6.csproj
index c58441f2..642bc2d5 100644
--- a/src/HtmlAgilityPack.NetStandard1_6/HtmlAgilityPack.NetStandard1_6.csproj
+++ b/src/HtmlAgilityPack.NetStandard1_6/HtmlAgilityPack.NetStandard1_6.csproj
@@ -12,7 +12,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>HtmlAgilityPack.snk</AssemblyOriginatorKeyFile>
     <AssemblyName>HtmlAgilityPack</AssemblyName>
-    <Version>1.11.1</Version>
+    <Version>1.11.24</Version>
     <Copyright>Copyright © ZZZ Projects Inc.</Copyright>
     <Company>ZZZ Projects Inc.</Company>
     <Product>Html Agility Pack</Product>
@@ -33,9 +33,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Net.Http" Version="4.3.1" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/HtmlAgilityPack.Shared/HtmlNode.cs b/src/HtmlAgilityPack.Shared/HtmlNode.cs
index 0e553b9f..aa7c50c2 100644
--- a/src/HtmlAgilityPack.Shared/HtmlNode.cs
+++ b/src/HtmlAgilityPack.Shared/HtmlNode.cs
@@ -1307,9 +1307,25 @@ public IEnumerable<HtmlAttribute> GetAttributes(params string[] attributeNames)
 		public string GetAttributeValue(string name, string def)
 		{
 #if METRO || NETSTANDARD1_3 || NETSTANDARD1_6
-            return GetAttributeValue(name, def);
+            if (name == null)
+			{
+				throw new ArgumentNullException("name");
+			}
+
+			if (!HasAttributes)
+			{
+				return def;
+			}
+
+			HtmlAttribute att = Attributes[name];
+			if (att == null)
+			{
+				return def;
+			}
+
+			return att.Value;
 #else
-            return GetAttributeValue<string>(name, def);
+			return GetAttributeValue<string>(name, def);
 #endif
         }