Fix potential race condition problem