One more attempt to fix auth issue