maybe fix race issue reported by BenGoldberg++, or at least make it better