Kind of fixed race condition