Fixed user race condition