Fixing yet another concurrency error.

Hopefully, this is the last of them. Honestly, I'm not sure I can abstract this any further.