diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 86689a45d..00c64fe1a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -28,6 +28,7 @@
  - fixed: Thingy: default thing property hidden (Yung Han Khoe) 
  - fixed: Ad Space Description Text Keeps Repopulating
  - fixed: Disabled Shipping methods still available
+ - fixed: Inherit Url From Parent is broken
  - added: ability to have metadata tags in head blocks
 
 7.5.20
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index aff5de518..291a49e1c 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -566,7 +566,7 @@ sub fixTitle {
 
 #-------------------------------------------------------------------
 
-=head2 fixUrl ( string )
+=head2 fixUrl ( url )
 
 Returns a URL, removing invalid characters and making it unique by
 adding a digit to the end if necessary.  URLs are not allowed to be
@@ -580,9 +580,10 @@ Assets have a maximum length of 250 characters.  Any URL longer than
 URLs will be passed through $session->url->urlize to make them WebGUI compliant.
 That includes any languages specific constraints set up in the default language pack.
 
-=head3 string
+=head3 url
 
-Any text string. Most likely will have been the Asset's name or title.
+Any text string. Most likely will have been the Asset's name or title.  If the string is not passed
+in, then a url will be constructed from
 
 =cut
 
@@ -600,12 +601,7 @@ sub fixUrl {
 
     # if we're inheriting the URL from our parent, set that appropriately
     if($self->get('inheritUrlFromParent')) {
-        my @parts = split(m{/},$url);
-
-        # don't do anything unless we need to
-        if("/$url" ne $self->getParent->getUrl . '/' . $parts[-1]) {
-            $url = $self->getParent->getUrl . '/' . $parts[-1];
-        }
+       $url = $self->fixUrlFromParent($url); 
     }
 
 	# fix urls used by uploads and extras
@@ -663,6 +659,40 @@ sub fixUrl {
 }
 
 
+#-------------------------------------------------------------------
+
+=head2 fixUrlFromParent ( url )
+
+URLs will be passed through $session->url->urlize to make them WebGUI compliant.
+That includes any languages specific constraints set up in the default language pack.
+
+=head3 url
+
+Any text string.
+
+=cut
+
+sub fixUrlFromParent {
+	my $self      = shift;
+	my $url       = shift;
+
+    # if we're inheriting the URL from our parent, set that appropriately
+    my @parts = split(m{/}, $url);
+
+    # don't do anything unless we need to
+    if("/$url" ne $self->getParent->getUrl . '/' . $parts[-1]) {
+        $url = $self->getParent->getUrl . '/' . $parts[-1];
+    }
+
+    ##Note we do not need to call fixUrl on the url argument.  Here's the reasoning why.
+    ##If a URL has not been set to updated at the same time that inheritUrlFromParent is
+    ##called, then it has already been "fixed".
+    ##On the other hand, if it has, the sideEffect nature of this method guarantees that
+    ##the URL was "fixed" before it was called.
+    return $url;
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 get ( [propertyName] )
@@ -2218,6 +2248,12 @@ sub update {
             {keywords=>$properties->{keywords}, asset=>$self});
     }
 
+    ##If inheritUrlFromParent was sent, and it is true, then muck with the url
+    ##The URL may have been sent too, so use it or the current Asset's URL.
+    if (exists $properties->{inheritUrlFromParent} and $properties->{inheritUrlFromParent}) {
+        $properties->{'url'} = $self->fixUrlFromParent($properties->{'url'} || $self->get('url'));
+    }
+
     # check the definition of all properties against what was given to us
     foreach my $definition (reverse @{$self->definition($self->session)}) {
 		my %setPairs = ();
@@ -2271,14 +2307,15 @@ sub update {
 
             # set the property
 			$self->{_properties}{$property} = $value;
-			$setPairs{$property.'=?'} = $value;
+			$setPairs{$property} = $value;
 		}
 
         # if there's anything to update, then do so
 		if (scalar(keys %setPairs) > 0) {
 			my @values = values %setPairs;
+            my @columnNames = map { $_.'=?' } keys %setPairs;
 			push(@values, $self->getId, $self->get("revisionDate"));
-			$self->session->db->write("update ".$definition->{tableName}." set ".join(",",keys %setPairs)." where assetId=? and revisionDate=?",\@values);
+			$self->session->db->write("update ".$definition->{tableName}." set ".join(",",@columnNames)." where assetId=? and revisionDate=?",\@values);
 		}
 	}
 
diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
index 9ffbe51a6..9c0304da0 100644
--- a/t/Asset/Asset.t
+++ b/t/Asset/Asset.t
@@ -146,7 +146,7 @@ $canViewMaker->prepare(
     },
 );
 
-plan tests => 99 
+plan tests => 100 
             + scalar(@fixIdTests)
             + scalar(@fixTitleTests)
             + 2*scalar(@getTitleTests) #same tests used for getTitle and getMenuTitle
@@ -325,6 +325,7 @@ $properties->{id}  = 'fixUrlAsset00000000015';
 $properties->{url} = 'fixUrlFolderURL100';
 
 my $fixUrlAsset4 = $defaultAsset->addChild($properties, $properties->{id});
+is($fixUrlAsset4->get('url'), 'fixurlfolderurl100', 'asset setup correctly for 100->101 test');
 
 delete $properties->{url};
 #                          '1234567890123456789012'