Possibly fix authenticaion problems?