Fix fix fix the URL substitution.

The previous patch was not correct either.