WW-4350 Solves problem with race condition