Avoid race condition that seems to happen on faster laptop...