Ghetto fix as a temporary measure to avoid race condition with Auth