Hopefully this solve authentication