more fixing race condition