Try to fix race condition in build system