Cleaned up a concurrency issue. Will need to use an event queue
to fully fix.