Fix for authentication issue