- Fix very likely race condition