Do we still have a race condition here?