Fixing the url invalid issue that I previously introduced