make sure to return the correct url