- fix rare race-condition