possible data race fix