This still doesn't fix the auth issue.