Should fix authentication