AuthHandler fix