Reimplemented one fix without changing the URLs

Corneliu Rusu (HTP): This can now be safely merged. The change doesn't affect the URLs.