Tentative fix for race condition