Trying to fix the URLs