Better fix for the authentication problem.