fixed race condition during startup
prepare next dev cycle