HOTFIX: Fix race condition problem