Fix for authentication