Oops. Lock race fix