Fix race condition on start