Fix for authorizing phase