Hopefully fixing authentication timing issue